[MERGE] trunk
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 10 Oct 2012 10:01:11 +0000 (12:01 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 10 Oct 2012 10:01:11 +0000 (12:01 +0200)
bzr revid: qdp-launchpad@openerp.com-20121010100111-vta17dz1vq6n6g9a


Trivial merge