[MERGE]
authorStephane Wirtel <stw@openerp.com>
Fri, 3 Aug 2012 14:45:55 +0000 (16:45 +0200)
committerStephane Wirtel <stw@openerp.com>
Fri, 3 Aug 2012 14:45:55 +0000 (16:45 +0200)
bzr revid: stw@openerp.com-20120803144555-4cfwpfh71cyundo5


Trivial merge