[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Fri, 29 Jun 2012 12:56:01 +0000 (14:56 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Fri, 29 Jun 2012 12:56:01 +0000 (14:56 +0200)
bzr revid: abo@openerp.com-20120629125601-jctwxucbo2jng73j


Trivial merge