mapred-site
Merge branch 'och2.0.0' of https://github.com/asiainfo-linkage/ochadoop into och2.0.0