[MERGE] bug lp:758699
authortfr@openerp.com <>
Fri, 13 May 2011 09:22:24 +0000 (11:22 +0200)
committertfr@openerp.com <>
Fri, 13 May 2011 09:22:24 +0000 (11:22 +0200)
bzr revid: tfr@openerp.com-20110513092224-ccmcetd4jhiyss01


Trivial merge