[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Fri, 10 Aug 2012 15:40:07 +0000 (17:40 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Fri, 10 Aug 2012 15:40:07 +0000 (17:40 +0200)
bzr revid: abo@openerp.com-20120810154007-n5x8zxxlxw5mw6c8


Trivial merge