Gitignore conflict
Merge branch 'trunk' of https://github.com/HazelChen/hadoop.git into trunk