[MERGE] trunk
authorAntonin Bourguignon <abo@openerp.com>
Mon, 19 Nov 2012 09:37:07 +0000 (10:37 +0100)
committerAntonin Bourguignon <abo@openerp.com>
Mon, 19 Nov 2012 09:37:07 +0000 (10:37 +0100)
bzr revid: abo@openerp.com-20121119093707-24kmpewzu19xe5p9


Trivial merge