[MERGE] opw 51093
authorolt@tinyerp.com <>
Fri, 27 Jan 2012 08:28:58 +0000 (09:28 +0100)
committerolt@tinyerp.com <>
Fri, 27 Jan 2012 08:28:58 +0000 (09:28 +0100)
bzr revid: olt@tinyerp.com-20120127082858-9ugz6ikcqkmzid6q


Trivial merge