Merge of -r 773835:773836 from trunk to branch-0.20 to fix HADOOP-5648.

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

CHANGES.txt

@@ -103,6 +103,9 @@ Release 0.20.1 - Unreleased
 
     HADOOP-5937. Correct a safemode message in FSNamesystem.  (Ravi Phulari
     via szetszwo)
+ 
+    HADOOP-5648. Fixes a build issue in not being able to generate gridmix.jar
+    in hadoop binary tarball. (Giridharan Kesavan via gkesavan)
 
 Release 0.20.0 - 2009-04-15
 

src/benchmarks/gridmix2/build.xml

@@ -59,7 +59,7 @@
 	       <include name="*.jar" />
 	       <exclude name="**/excluded/" />
 	    </fileset>
-	    <fileset dir="${hadoop.dir}/build">
+	    <fileset dir="${hadoop.dir}">
 	       <include name="**.jar" />
            <include name="contrib/streaming/*.jar" />
 	    </fileset>