[Merge]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Mon, 16 Aug 2010 05:07:58 +0000 (10:37 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Mon, 16 Aug 2010 05:07:58 +0000 (10:37 +0530)
bzr revid: rpa@tinyerp.com-20100816050758-a8m372e252qkwdsh


Trivial merge