[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Mon, 13 Sep 2010 05:20:05 +0000 (10:50 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Mon, 13 Sep 2010 05:20:05 +0000 (10:50 +0530)
bzr revid: vir@tinyerp.com-20100913052005-i9eupb5kopazqvvt


Trivial merge