[MERGE] OPW 19972
authorXavier ALT <xal@openerp.com>
Fri, 24 Feb 2012 14:22:06 +0000 (15:22 +0100)
committerXavier ALT <xal@openerp.com>
Fri, 24 Feb 2012 14:22:06 +0000 (15:22 +0100)
bzr revid: xal@openerp.com-20120224142206-arzi85zkuda0g418


Trivial merge