[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Mon, 30 Aug 2010 04:25:37 +0000 (09:55 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Mon, 30 Aug 2010 04:25:37 +0000 (09:55 +0530)
bzr revid: vir@tinyerp.com-20100827043352-k3n4ox9tngq2ecfv
bzr revid: vir@tinyerp.com-20100830042537-djn9ch11go18qnfg


Trivial merge