[MERGE]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Thu, 16 Sep 2010 05:31:43 +0000 (11:01 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Thu, 16 Sep 2010 05:31:43 +0000 (11:01 +0530)
bzr revid: rpa@tinyerp.com-20100916053143-3coua70zov9z4b63


Trivial merge