tree 38c9b332d25c9afa4493fb1e51418cee4cc7b43b
parent e9c19369a9c3837313f4dd889c425adbfd103171
parent 5faf37f312ee0d6bcc8dd258359be66d3092bfaa
author Nabin Hait <nabinhait@gmail.com> 1342073860 +0530
committer Nabin Hait <nabinhait@gmail.com> 1342073860 +0530

fixed conflict in setup control