[MERGE] lp:891037
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Tue, 3 Jan 2012 07:59:11 +0000 (08:59 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Tue, 3 Jan 2012 07:59:11 +0000 (08:59 +0100)
bzr revid: qdp-launchpad@openerp.com-20120103075911-e0cfyzqb4mefxq9z


Trivial merge