[MERGE] opw 51127
authorolt@tinyerp.com <>
Fri, 13 Jan 2012 13:16:21 +0000 (14:16 +0100)
committerolt@tinyerp.com <>
Fri, 13 Jan 2012 13:16:21 +0000 (14:16 +0100)
bzr revid: olt@tinyerp.com-20120113131621-uyvqakqsoczhsg64


Trivial merge