[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Mon, 25 Oct 2010 04:51:59 +0000 (10:21 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Mon, 25 Oct 2010 04:51:59 +0000 (10:21 +0530)
bzr revid: vir@tinyerp.com-20101025045159-z7wz62ykybloq56x


Trivial merge