[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Wed, 20 Jun 2012 08:48:19 +0000 (10:48 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Wed, 20 Jun 2012 08:48:19 +0000 (10:48 +0200)
bzr revid: abo@openerp.com-20120620084819-k7pha7zwyggceh1w


Trivial merge