[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Wed, 8 Sep 2010 04:52:32 +0000 (10:22 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Wed, 8 Sep 2010 04:52:32 +0000 (10:22 +0530)
bzr revid: vir@tinyerp.com-20100908045232-nkq4s1f5ejvhr3vn


Trivial merge