[MERGE] resubmit OPW 383649
authorXavier ALT <xal@openerp.com>
Fri, 24 Feb 2012 15:48:17 +0000 (16:48 +0100)
committerXavier ALT <xal@openerp.com>
Fri, 24 Feb 2012 15:48:17 +0000 (16:48 +0100)
bzr revid: xal@openerp.com-20120224154817-m64kg3tizs0scp7e


Trivial merge