[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Wed, 25 Aug 2010 04:18:00 +0000 (09:48 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Wed, 25 Aug 2010 04:18:00 +0000 (09:48 +0530)
bzr revid: vir@tinyerp.com-20100825041800-fmn9h3uvs1wj02j9


Trivial merge