[MERGE] lp: 908020
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 5 Jan 2012 10:52:05 +0000 (11:52 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 5 Jan 2012 10:52:05 +0000 (11:52 +0100)
bzr revid: qdp-launchpad@openerp.com-20120105105205-m0mnxui3nm6ayyna


Trivial merge