tree 83e426196391a949f225340f7a096a12c1ed28cb
parent 09b97eed03f1fd2ea2a02e8bfbb381c1f686f564
author Owen O'Malley <omalley@apache.org> 1300739911 +0000
committer Owen O'Malley <omalley@apache.org> 1300739911 +0000

Fix up bad merge from r1079222.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/branches/yahoo-merge@1083948 13f79535-47bb-0310-9956-ffa450edef68