[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)
commit09d4c1cfaa97200b85c484570986f6995766d5f2
tree3d03bbb63a2f9600d391ab9ebe167cfc4adeebb6
parentabba7eaf0af111135b4da8fbd12d9a0cbd214288
parentc8fa3f95206b333b7ac458af506c41fdf94cef76
[MERGE] OPW 52676

bzr revid: xal@openerp.com-20120221112431-hu08wz4681wb530w