[MERGE] fix bug 724788
authorThibault Francois <tfr@openerp.com>
Tue, 1 Mar 2011 17:15:14 +0000 (18:15 +0100)
committerThibault Francois <tfr@openerp.com>
Tue, 1 Mar 2011 17:15:14 +0000 (18:15 +0100)
bzr revid: tfr@openerp.com-20110301171514-pw8dptkflutzg1hl


Trivial merge