[Merge]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Wed, 25 Aug 2010 05:38:52 +0000 (11:08 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Wed, 25 Aug 2010 05:38:52 +0000 (11:08 +0530)
bzr revid: rpa@tinyerp.com-20100825053852-vecfoba8ot3j6m7b


Trivial merge