[MERGE]
authorStephane Wirtel <stephane@openerp.com>
Fri, 12 Mar 2010 10:58:03 +0000 (11:58 +0100)
committerStephane Wirtel <stephane@openerp.com>
Fri, 12 Mar 2010 10:58:03 +0000 (11:58 +0100)
bzr revid: stephane@openerp.com-20100312105803-zytgew4zwwo3kzr6


Trivial merge