[MERGE]: Merge with lp:~openerp-dev/openobject-addons/rpa-dev-addons2
authorrpa (Open ERP) <rpa@tinyerp.com>
Fri, 4 Jun 2010 12:25:48 +0000 (17:55 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Fri, 4 Jun 2010 12:25:48 +0000 (17:55 +0530)
bzr revid: rpa@tinyerp.com-20100604122548-2tsp7azj0icf9xzm


Trivial merge