[MERGE] OPW 383649
authorXavier ALT <xal@openerp.com>
Thu, 16 Feb 2012 15:55:40 +0000 (16:55 +0100)
committerXavier ALT <xal@openerp.com>
Thu, 16 Feb 2012 15:55:40 +0000 (16:55 +0100)
bzr revid: xal@openerp.com-20120216155540-zfiob23xor98t42c


Trivial merge