[MERGE] lp:780598
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 18 May 2011 16:37:20 +0000 (18:37 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 18 May 2011 16:37:20 +0000 (18:37 +0200)
bzr revid: qdp-launchpad@openerp.com-20110518163720-ltd5wagqofpcebsa


Trivial merge