[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
authorrpa (Open ERP) <rpa@tinyerp.com>
Wed, 17 Mar 2010 13:27:26 +0000 (18:57 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Wed, 17 Mar 2010 13:27:26 +0000 (18:57 +0530)
bzr revid: rpa@tinyerp.com-20100317132726-li1bad11xetkv1wh


Trivial merge