[MERGE] opw 51026
authorolt@tinyerp.com <>
Fri, 27 Jan 2012 07:55:46 +0000 (08:55 +0100)
committerolt@tinyerp.com <>
Fri, 27 Jan 2012 07:55:46 +0000 (08:55 +0100)
bzr revid: olt@tinyerp.com-20120127075546-wlf51c967reolndk


Trivial merge