[MERGE] Sync with trunk
authorOlivier Dony <odo@openerp.com>
Tue, 4 Dec 2012 16:26:21 +0000 (17:26 +0100)
committerOlivier Dony <odo@openerp.com>
Tue, 4 Dec 2012 16:26:21 +0000 (17:26 +0100)
bzr revid: odo@openerp.com-20121204162621-uqvqssyjoa3qsxn3


Trivial merge