[MERGE] lp:869841
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 10 Oct 2011 10:08:06 +0000 (12:08 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 10 Oct 2011 10:08:06 +0000 (12:08 +0200)
bzr revid: qdp-launchpad@openerp.com-20111010100806-h41f1kmn6z0uslwl


Trivial merge