[MERGE]
authorStephane Wirtel <stw@openerp.com>
Thu, 15 Sep 2011 08:59:25 +0000 (10:59 +0200)
committerStephane Wirtel <stw@openerp.com>
Thu, 15 Sep 2011 08:59:25 +0000 (10:59 +0200)
bzr revid: stw@openerp.com-20110915085925-hs86f0w3ptyynxjh


Trivial merge