[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Fri, 3 Sep 2010 04:37:18 +0000 (10:07 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Fri, 3 Sep 2010 04:37:18 +0000 (10:07 +0530)
commita74a3ebfcb976592eceb884f00226e5236667fac
tree82afc520faf44e0b6b9a01f9be940fefe68b129e
parentf3a7bead45475485962a889a804812ab0b7d3637
parent014363d304e890135b666dabedf48d6b9cc5ba92
[Merge]

bzr revid: vir@tinyerp.com-20100901043056-e8pwz72pezbhqy40
bzr revid: vir@tinyerp.com-20100903043718-c6nv0ayvqpom7uuh