[MERGE] trunk
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Tue, 11 Dec 2012 16:05:39 +0000 (17:05 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Tue, 11 Dec 2012 16:05:39 +0000 (17:05 +0100)
bzr revid: qdp-launchpad@openerp.com-20121211160539-kf3cx6xintsr92qk


Trivial merge