[MERGE]: Merge with latest trunk-addons
authorRucha (Open ERP) <rpa@tinyerp.com>
Wed, 4 Jul 2012 11:38:56 +0000 (17:08 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Wed, 4 Jul 2012 11:38:56 +0000 (17:08 +0530)
bzr revid: rpa@tinyerp.com-20120704113856-vytxzu1zf6x6mnip


Trivial merge