[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Wed, 22 Aug 2012 18:11:27 +0000 (20:11 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Wed, 22 Aug 2012 18:11:27 +0000 (20:11 +0200)
bzr revid: abo@openerp.com-20120822181127-mcs2n9b9l5ksonq0


Trivial merge