[MERGE]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Mon, 10 May 2010 05:43:01 +0000 (11:13 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Mon, 10 May 2010 05:43:01 +0000 (11:13 +0530)
bzr revid: rpa@tinyerp.com-20100510054301-smd51pervf0xhrih


Trivial merge