[MERGE]
authorHarry (Open ERP) <hmo@tinyerp.com>
Wed, 13 Jan 2010 15:48:24 +0000 (21:18 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Wed, 13 Jan 2010 15:48:24 +0000 (21:18 +0530)
commitbb06f67132790590185659aeb0899026dc4e4695
tree9ff16101546869e57d1ca5dad7b79e4d48862fe9
parent90d992501d0a5a0af804c61a94952b02b8820f34
parent18b3c4764957ca59dc871e8dfdb68610772ff023
[MERGE]

bzr revid: hmo@tinyerp.com-20100113154824-wes2er4ort5c6sol