[MERGE] OPW 51172
authorXavier ALT <xal@openerp.com>
Tue, 21 Feb 2012 11:37:59 +0000 (12:37 +0100)
committerXavier ALT <xal@openerp.com>
Tue, 21 Feb 2012 11:37:59 +0000 (12:37 +0100)
bzr revid: xal@openerp.com-20120221113759-0v5sv8qcpsergeml


Trivial merge