tree 3b81afe009c89d9478e81830ab7173c4633ef467
parent 963f36b969a2eca9e2e0e4b15a94488a8aa6d26e
parent 627d01bd4b8ad6469694bfe43e6869511addd0bb
author nabinhait <nabinhait@gmail.com> 1309518123 +0530
committer nabinhait <nabinhait@gmail.com> 1309518123 +0530

resoved conflict in patch, company and renaming tools