[MERGE] OPW 381612
authorXavier ALT <xal@openerp.com>
Fri, 24 Feb 2012 16:33:45 +0000 (17:33 +0100)
committerXavier ALT <xal@openerp.com>
Fri, 24 Feb 2012 16:33:45 +0000 (17:33 +0100)
bzr revid: xal@openerp.com-20120224163345-zgdkxp17glcfhuu3


Trivial merge