[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Mon, 11 Oct 2010 04:55:12 +0000 (10:25 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Mon, 11 Oct 2010 04:55:12 +0000 (10:25 +0530)
bzr revid: vir@tinyerp.com-20101011045512-41o7ihz8djs7mxhc


Trivial merge