[MERGE] lp: 753651
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 20 Apr 2011 15:31:59 +0000 (17:31 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 20 Apr 2011 15:31:59 +0000 (17:31 +0200)
bzr revid: qdp-launchpad@openerp.com-20110420153159-3eyke1hf34yx3w96


Trivial merge