commit
Merge github.com:rasokan/hadoop