misc
Merge branch 'master' of git://github.com/ibrunton/log
Merge branch 'master' of git://github.com/ibrunton/log
code clean-up