[MERGE] OPW 57602
authorXavier ALT <xal@openerp.com>
Fri, 24 Feb 2012 14:09:26 +0000 (15:09 +0100)
committerXavier ALT <xal@openerp.com>
Fri, 24 Feb 2012 14:09:26 +0000 (15:09 +0100)
bzr revid: xal@openerp.com-20120224140926-h5arpvh551ux3u23


Trivial merge