[MERGE]
authorHarry (OpenERP) <hmo@tinyerp.com>
Fri, 3 Sep 2010 06:15:00 +0000 (11:45 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Fri, 3 Sep 2010 06:15:00 +0000 (11:45 +0530)
bzr revid: hmo@tinyerp.com-20100903061500-xn08bdbzr3xzenb4


Trivial merge