[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Fri, 23 Jul 2010 06:48:05 +0000 (12:18 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Fri, 23 Jul 2010 06:48:05 +0000 (12:18 +0530)
bzr revid: vir@tinyerp.com-20100723064805-bbzk4115vynfwutg


Trivial merge