[MERGE] fix bug lp:798190 bde
authortfr@openerp.com <>
Fri, 1 Jul 2011 13:01:05 +0000 (15:01 +0200)
committertfr@openerp.com <>
Fri, 1 Jul 2011 13:01:05 +0000 (15:01 +0200)
bzr revid: tfr@openerp.com-20110701130105-os7smkh9bpb0irhg


Trivial merge