[MERGE]
authorStephane Wirtel <stephane@openerp.com>
Tue, 30 Mar 2010 16:41:00 +0000 (18:41 +0200)
committerStephane Wirtel <stephane@openerp.com>
Tue, 30 Mar 2010 16:41:00 +0000 (18:41 +0200)
bzr revid: stephane@openerp.com-20100330164100-b939l3qnx9syqffk


Trivial merge