[MERGE] opw 50831
authorolt@tinyerp.com <>
Fri, 27 Jan 2012 08:48:07 +0000 (09:48 +0100)
committerolt@tinyerp.com <>
Fri, 27 Jan 2012 08:48:07 +0000 (09:48 +0100)
bzr revid: olt@tinyerp.com-20120127084807-br1qcn5lyhbn5vqn


Trivial merge