[MERGE]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Fri, 28 May 2010 09:15:04 +0000 (14:45 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Fri, 28 May 2010 09:15:04 +0000 (14:45 +0530)
bzr revid: rpa@tinyerp.com-20100528091504-l76uiduokyt7hx5o


Trivial merge