[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Wed, 12 Sep 2012 10:07:46 +0000 (12:07 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Wed, 12 Sep 2012 10:07:46 +0000 (12:07 +0200)
bzr revid: abo@openerp.com-20120912100746-1c2l3starj61b32y


Trivial merge