[MERGE]
authorjas <jas@tinyerp.com>
Thu, 21 Oct 2010 05:53:27 +0000 (11:23 +0530)
committerjas <jas@tinyerp.com>
Thu, 21 Oct 2010 05:53:27 +0000 (11:23 +0530)
commitaa386c8d73091bf7d71734104f419789397b7934
tree490c1b7b2a8afef9311b7811300538e6e82d3170
parentbdfdfbc8f6609dd9b074f3c2871a0a3e583a4733
parent990467492dabbf2912ca56fb81e6507873c05441
[MERGE]

bzr revid: jas@tinyerp.com-20101021055327-rfwqba5qwkov9u8f