Throw-away branch for testing MAPREDUCE-279 merge to trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-279-merge@1158892 13f79535-47bb-0310-9956-ffa450edef68