[MERGE]
authorHarry (Open ERP) <hmo@tinyerp.com>
Wed, 3 Mar 2010 14:33:56 +0000 (20:03 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Wed, 3 Mar 2010 14:33:56 +0000 (20:03 +0530)
bzr revid: hmo@tinyerp.com-20100303143356-kgjsid75wf9gtsxv


Trivial merge