[MERGE]
authortfr@openerp.com <>
Tue, 12 Jul 2011 15:21:32 +0000 (17:21 +0200)
committertfr@openerp.com <>
Tue, 12 Jul 2011 15:21:32 +0000 (17:21 +0200)
bzr revid: tfr@openerp.com-20110712152132-q2m2o852q52qybnk


Trivial merge