[MERGE]
authorHarry (Open ERP) <hmo@tinyerp.com>
Tue, 2 Mar 2010 09:06:13 +0000 (14:36 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Tue, 2 Mar 2010 09:06:13 +0000 (14:36 +0530)
bzr revid: hmo@tinyerp.com-20100302090613-bklsbvjqye14xytd


Trivial merge