[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Tue, 29 Jun 2010 04:54:28 +0000 (10:24 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Tue, 29 Jun 2010 04:54:28 +0000 (10:24 +0530)
bzr revid: vir@tinyerp.com-20100629045428-zlun29to8am37ibe


Trivial merge