[MERGE]
authorHarry (Open ERP) <hmo@tinyerp.com>
Wed, 28 Apr 2010 13:58:59 +0000 (19:28 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Wed, 28 Apr 2010 13:58:59 +0000 (19:28 +0530)
bzr revid: hmo@tinyerp.com-20100428135859-uoh8s8svtrfy88wh


Trivial merge