[MERGE]
authorjas <jas@tinyerp.com>
Wed, 13 Oct 2010 11:12:45 +0000 (16:42 +0530)
committerjas <jas@tinyerp.com>
Wed, 13 Oct 2010 11:12:45 +0000 (16:42 +0530)
commitd5052f52db5645032730db566306c87b54f02308
tree37ed1dcac90b018f51ce0bbc48589711b5d3a282
parentd553fc7f3d53a53861d2dd7b6a13719220d6ef0d
parent896ebda0aed93c01cb381e20404139211c1cb571
[MERGE]

bzr revid: jas@tinyerp.com-20101013111245-21e7cwqqrnd5mihd