[Merge]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Wed, 11 Aug 2010 05:20:16 +0000 (10:50 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Wed, 11 Aug 2010 05:20:16 +0000 (10:50 +0530)
bzr revid: rpa@tinyerp.com-20100811052016-2v5kvngxnoub7n2s


Trivial merge