[MERGE] opw 51206
authorolt@tinyerp.com <>
Thu, 15 Dec 2011 07:11:08 +0000 (08:11 +0100)
committerolt@tinyerp.com <>
Thu, 15 Dec 2011 07:11:08 +0000 (08:11 +0100)
commit49e686e86ec57ccda00f612efe30637c459d556e
tree499dcee3450f52d40daf16c766439ba9d6c49c00
parent8b430e670eac766327d14bd467857c77d6257fe6
parentd21e1d2cfb3aadb79c03aa1b51fd1c02211f0087
[MERGE] opw 51206

bzr revid: olt@tinyerp.com-20111215071108-v9y3non45j6dpr2y