[MERGE] lp 909009
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 29 Dec 2011 16:44:03 +0000 (17:44 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 29 Dec 2011 16:44:03 +0000 (17:44 +0100)
bzr revid: qdp-launchpad@openerp.com-20111229164403-tz33s6zvtxw4plv1


Trivial merge