[MERGE] lp:718722
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 17 Mar 2011 17:01:51 +0000 (18:01 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 17 Mar 2011 17:01:51 +0000 (18:01 +0100)
bzr revid: qdp-launchpad@openerp.com-20110317170151-1cz24pohb4z4w1jk


Trivial merge