[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)
commit5dc0b98550ac9d32b1c1272ba43c17cb064428b2
tree602c76326e7f0e00d6dba0b8ffbfa77679b4a3a6
parent09d4c1cfaa97200b85c484570986f6995766d5f2
parentc322cbafa4f614a804a61fcb10a1a145f43f1e77
[MERGE] OPW 51172

bzr revid: xal@openerp.com-20120221113759-0v5sv8qcpsergeml