[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Mon, 2 Aug 2010 05:38:42 +0000 (11:08 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Mon, 2 Aug 2010 05:38:42 +0000 (11:08 +0530)
bzr revid: vir@tinyerp.com-20100802053842-nbs7j7jz2yvm52g2


Trivial merge