[MERGE]
authorStephane Wirtel <stephane@openerp.com>
Thu, 15 Jul 2010 14:17:56 +0000 (16:17 +0200)
committerStephane Wirtel <stephane@openerp.com>
Thu, 15 Jul 2010 14:17:56 +0000 (16:17 +0200)
bzr revid: stephane@openerp.com-20100715141756-fhzyv8tjynlykage


Trivial merge