[MERGE] trunk
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 13 Dec 2012 09:52:37 +0000 (10:52 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 13 Dec 2012 09:52:37 +0000 (10:52 +0100)
bzr revid: qdp-launchpad@openerp.com-20121213095237-gmp54miih4n4m4r8


Trivial merge