[MERGE]
authorHarry (Open ERP) <hmo@tinyerp.com>
Tue, 9 Mar 2010 11:25:34 +0000 (16:55 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Tue, 9 Mar 2010 11:25:34 +0000 (16:55 +0530)
bzr revid: hmo@tinyerp.com-20100309112534-bibte8vo972fqjd4


Trivial merge