[MERGE] lp: 751296
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 20 Apr 2011 14:43:52 +0000 (16:43 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 20 Apr 2011 14:43:52 +0000 (16:43 +0200)
bzr revid: qdp-launchpad@openerp.com-20110420144352-hi24w8j0n50npcbr


Trivial merge