[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Tue, 21 Aug 2012 12:56:45 +0000 (14:56 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Tue, 21 Aug 2012 12:56:45 +0000 (14:56 +0200)
bzr revid: abo@openerp.com-20120821125645-52zbzsgx9232llnv


Trivial merge