[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)
commit8031bcca09a6be004c0e35b350e08cf68b402626
treec63cef51413e8f40879b89cd5057f76becf42d8f
parent3c392120b6d6bcbc85b105d846d79fcb71568e4c
parent19d6323d8178063ada6bd4aa0586658964157e03
[MERGE] resubmit OPW 383649

bzr revid: xal@openerp.com-20120224154817-m64kg3tizs0scp7e