HADOOP-9372. Merge r1453637 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485852 13f79535-47bb-0310-9956-ffa450edef68

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -304,7 +304,10 @@ Release 2.0.5-beta - UNRELEASED
     HADOOP-9373. Merge CHANGES.branch-trunk-win.txt to CHANGES.txt.
     (suresh)
 
-Release 2.0.4-alpha - 2013-04-25 
+    HADOOP-9372. Fix bad timeout annotations on tests.
+    (Arpit Agarwal via suresh)
+
+Release 2.0.4-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES
 

hadoop-mapreduce-project/CHANGES.txt

@@ -306,7 +306,10 @@ Release 2.0.5-beta - UNRELEASED
     MAPREDUCE-4983. Fixed various platform specific assumptions in various tests,
     so that they can pass on Windows too. (Chris Nauroth via vinodkv)
 
-Release 2.0.4-alpha - 2013-04-25
+    HADOOP-9372. Fix bad timeout annotations on tests.
+    (Arpit Agarwal via suresh)
+
+Release 2.0.4-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES