[MERGE]: Merge with latest trunk-addons
authorRucha (Open ERP) <rpa@tinyerp.com>
Fri, 17 Aug 2012 05:06:50 +0000 (10:36 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Fri, 17 Aug 2012 05:06:50 +0000 (10:36 +0530)
bzr revid: rpa@tinyerp.com-20120817050650-o9bv5oav40s7s6ql


Trivial merge