[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Thu, 9 Sep 2010 05:23:22 +0000 (10:53 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Thu, 9 Sep 2010 05:23:22 +0000 (10:53 +0530)
bzr revid: vir@tinyerp.com-20100909052322-tdq11jjv6aavdhjr


Trivial merge