[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Wed, 20 Oct 2010 04:50:40 +0000 (10:20 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Wed, 20 Oct 2010 04:50:40 +0000 (10:20 +0530)
bzr revid: vir@tinyerp.com-20101020045040-j4y2zre12tos1e9x


Trivial merge