[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Thu, 7 Oct 2010 04:46:13 +0000 (10:16 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Thu, 7 Oct 2010 04:46:13 +0000 (10:16 +0530)
bzr revid: vir@tinyerp.com-20101007044613-nuwgi56zgp0mjhng


Trivial merge