[MERGE]
authorHarry (Open ERP) <hmo@tinyerp.com>
Fri, 26 Feb 2010 10:09:03 +0000 (15:39 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Fri, 26 Feb 2010 10:09:03 +0000 (15:39 +0530)
bzr revid: hmo@tinyerp.com-20100226100903-9o0znndezon2vzm7


Trivial merge