[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)
bzr revid: vir@tinyerp.com-20100901043056-e8pwz72pezbhqy40
bzr revid: vir@tinyerp.com-20100903043718-c6nv0ayvqpom7uuh


Trivial merge