[MERGE]
authorjas <jas@tinyerp.com>
Tue, 26 Oct 2010 11:09:17 +0000 (16:39 +0530)
committerjas <jas@tinyerp.com>
Tue, 26 Oct 2010 11:09:17 +0000 (16:39 +0530)
commitdcf15878521fca4e5adf8df217cd9d198dc7fffc
tree7c37f598369d9d116fd0582ce492fd4502df5c5d
parentbc00ef219fbc8485b01221dc4b25de1c9e9ad836
parentcd19af0bf5406838b193daa91b5979418ed43684
[MERGE]

bzr revid: jas@tinyerp.com-20101026110917-u5fh6n2cn1uo0g5u