Merge -r 778965:778966 from trunk onto 0.20 branch.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.20@778967 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -86,9 +86,6 @@ Release 0.20.1 - Unreleased
     HADOOP-5728. Fixed FSEditLog.printStatistics IndexOutOfBoundsException.
     (Wang Xu via johan)    
 
-    HADOOP-5816. Fixes a problem in the KeyFieldBasedComparator to do with
-    ArrayIndexOutOfBounds exception. (He Yongqiang via ddas)
-
 Release 0.20.0 - 2009-04-15
 
   INCOMPATIBLE CHANGES
@@ -1043,6 +1040,9 @@ Release 0.19.2 - Unreleased
     HADOOP-5579. Set errno correctly in libhdfs for permission, quota, and FNF
     conditions. (Brian Bockelman via cdouglas)
 
+    HADOOP-5816. Fixes a problem in the KeyFieldBasedComparator to do with
+    ArrayIndexOutOfBounds exception. (He Yongqiang via ddas)
+
 Release 0.19.1 - 2009-02-23 
 
   IMPROVEMENTS