[MERGE]
authornch@tinyerp.com <>
Wed, 7 Oct 2009 06:47:33 +0000 (12:17 +0530)
committernch@tinyerp.com <>
Wed, 7 Oct 2009 06:47:33 +0000 (12:17 +0530)
commita57d60550699c39a5d36b9d5144d7a504178d47a
tree42385d63039da5d0a0978d861cb8b00fc6b76fd5
parent5dae251b63db34a2816d5937c9d25792f71b20ef
parent91c19a813ff688c21daf604041b5ce02312f5ba9
[MERGE]

bzr revid: nch@tinyerp.com-20091007064733-g7gc471acmfcetmb