[MERGE]: Merge with latest trunk-addons
authorRucha (Open ERP) <rpa@tinyerp.com>
Thu, 13 Sep 2012 05:30:58 +0000 (11:00 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Thu, 13 Sep 2012 05:30:58 +0000 (11:00 +0530)
bzr revid: rpa@tinyerp.com-20120913053058-unlfdj92o69rnjam


Trivial merge