[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Tue, 16 Mar 2010 05:01:33 +0000 (10:31 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Tue, 16 Mar 2010 05:01:33 +0000 (10:31 +0530)
bzr revid: vir@tinyerp.com-20100316050133-gjdej71jk1ncvs81


Trivial merge