[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Wed, 13 Oct 2010 04:42:37 +0000 (10:12 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Wed, 13 Oct 2010 04:42:37 +0000 (10:12 +0530)
bzr revid: vir@tinyerp.com-20101013044237-k3wbnz3u3gwv0tu9


Trivial merge