[MERGE] fix bug lp:802539
authortfr@openerp.com <>
Tue, 28 Jun 2011 14:48:18 +0000 (16:48 +0200)
committertfr@openerp.com <>
Tue, 28 Jun 2011 14:48:18 +0000 (16:48 +0200)
bzr revid: tfr@openerp.com-20110628144818-tqjtu8yilv298spf


Trivial merge