[MERGE]
authornch@tinyerp.com <>
Fri, 9 Oct 2009 09:58:15 +0000 (15:28 +0530)
committernch@tinyerp.com <>
Fri, 9 Oct 2009 09:58:15 +0000 (15:28 +0530)
commit797b36fdb0f6f87a0f34773c58a4a3bc10598750
tree75ef4626836b58e2a3f6696b8b3842365aa99e0e
parent6c18b536767547dabe8165a0f7312069bfaff50a
parent1052e1213dd405fb9050ac6e9e3b5e25d68b4e61
[MERGE]

bzr revid: nch@tinyerp.com-20091009095815-xa0ec5gn1zs0gcig