[MERGE]
authorHarry (OpenERP) <hmo@tinyerp.com>
Mon, 12 Jul 2010 11:23:32 +0000 (16:53 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Mon, 12 Jul 2010 11:23:32 +0000 (16:53 +0530)
bzr revid: hmo@tinyerp.com-20100712112332-e1uhmq93a2jesv0z


Trivial merge