catching up to trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/branches/HDFS-641@834556 13f79535-47bb-0310-9956-ffa450edef68
20 files changed