[MERGE]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Fri, 2 Apr 2010 05:14:55 +0000 (10:44 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Fri, 2 Apr 2010 05:14:55 +0000 (10:44 +0530)
bzr revid: rpa@tinyerp.com-20100402051455-ytooke4xf1gtw0t5


Trivial merge