[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Mon, 20 Aug 2012 14:51:53 +0000 (16:51 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Mon, 20 Aug 2012 14:51:53 +0000 (16:51 +0200)
bzr revid: abo@openerp.com-20120820145153-fa8movasb860sjff


Trivial merge