[MERGE]
authorHarry (Open ERP) <hmo@tinyerp.com>
Tue, 19 Jan 2010 07:19:24 +0000 (12:49 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Tue, 19 Jan 2010 07:19:24 +0000 (12:49 +0530)
bzr revid: hmo@tinyerp.com-20100119071924-8tnbzkdvm4jqfokz


Trivial merge