[MERGE] lp: 890701
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 16 Nov 2011 10:57:57 +0000 (11:57 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 16 Nov 2011 10:57:57 +0000 (11:57 +0100)
bzr revid: qdp-launchpad@openerp.com-20111116105757-ls4r391qg4vwhvn5


Trivial merge