[Merge]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Thu, 26 Aug 2010 05:04:02 +0000 (10:34 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Thu, 26 Aug 2010 05:04:02 +0000 (10:34 +0530)
bzr revid: rpa@tinyerp.com-20100826050402-283hoq9e759fd2ox


Trivial merge