[MERGE] fix bug 781593 by dbr
authortfr@openerp.com <>
Wed, 15 Jun 2011 09:13:18 +0000 (11:13 +0200)
committertfr@openerp.com <>
Wed, 15 Jun 2011 09:13:18 +0000 (11:13 +0200)
bzr revid: tfr@openerp.com-20110615091318-klusot6ucya9g40e


Trivial merge