[MERGE] opw 54583
authorolt@tinyerp.com <>
Fri, 13 Jan 2012 13:27:46 +0000 (14:27 +0100)
committerolt@tinyerp.com <>
Fri, 13 Jan 2012 13:27:46 +0000 (14:27 +0100)
commite1194642416efd2c0ab68fa4535a0c9d619f6f3e
tree0ad6eb8e621e0b5a3dc68b1fb26e70984765bada
parent90aaec8b04d8256c53f0553b670d8b21ed496f2d
parentbb9d770ee19a11fa05247ed5a0d4c03117d78153
[MERGE] opw 54583

bzr revid: olt@tinyerp.com-20120113132746-jas2wnut1xv8ucys