tree 9116b265261ddccc649d0fc965c1b891f2f30c2d
parent f18f638c1ba31d647abb83230968d9017b326661
author Thomas White <tomwhite@apache.org> 1294773828 +0000
committer Thomas White <tomwhite@apache.org> 1294773828 +0000

Merge -r 1057805:1057806 from trunk to branch-0.21. Fixes: MAPREDUCE-1929.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/branches/branch-0.21@1057813 13f79535-47bb-0310-9956-ffa450edef68