[MERGE] opw 17798
authorolt@tinyerp.com <>
Fri, 2 Dec 2011 10:51:21 +0000 (11:51 +0100)
committerolt@tinyerp.com <>
Fri, 2 Dec 2011 10:51:21 +0000 (11:51 +0100)
commitb2bb1c7f7fab1ac01c31d3ad2815c70ca5800ac2
treebbe3692f1fb597acb46b07a7fea53034da532ac8
parentf91a81c3dba29bab44e315d583c4f7f6953ae957
parente643b538a03db649c6cbb195c59a3815a5302512
[MERGE] opw 17798

bzr revid: olt@tinyerp.com-20111202105121-whdmt0136ijgit13