[MERGE]
authorHarry (Open ERP) <hmo@tinyerp.com>
Wed, 10 Mar 2010 11:24:05 +0000 (16:54 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Wed, 10 Mar 2010 11:24:05 +0000 (16:54 +0530)
bzr revid: hmo@tinyerp.com-20100310112405-2aay4j0a5v7l5yn1


Trivial merge