[MERGE] lp:700154
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 24 Mar 2011 10:08:14 +0000 (11:08 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 24 Mar 2011 10:08:14 +0000 (11:08 +0100)
bzr revid: qdp-launchpad@openerp.com-20110324100814-c3lz3vak7u5zs1ae


Trivial merge