[MERGE] OPW 52676
authorXavier ALT <xal@openerp.com>
Tue, 21 Feb 2012 11:24:31 +0000 (12:24 +0100)
committerXavier ALT <xal@openerp.com>
Tue, 21 Feb 2012 11:24:31 +0000 (12:24 +0100)
bzr revid: xal@openerp.com-20120221112431-hu08wz4681wb530w


Trivial merge