[MERGE] lp:915426
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 18 Jan 2012 12:50:46 +0000 (13:50 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 18 Jan 2012 12:50:46 +0000 (13:50 +0100)
bzr revid: qdp-launchpad@openerp.com-20120118125046-rlre1oheeuwfepwh


Trivial merge