[MERGE] opw 50912
authorolt@tinyerp.com <>
Fri, 16 Dec 2011 08:18:55 +0000 (09:18 +0100)
committerolt@tinyerp.com <>
Fri, 16 Dec 2011 08:18:55 +0000 (09:18 +0100)
commitaffd5a4a7cb186a3ebd79a49db9778f54287970b
treec4a544200f4f1608a61e27c01d80bc8449c6b137
parentf086ea4aeb5f74d23e2b507ebb4c7dcc4f81c14a
parent67159d6637277e82d538a1fc44c48c8148a767f2
[MERGE] opw 50912

bzr revid: olt@tinyerp.com-20111216081855-2y4x8ybr02ieckv0