Merge -r662503:662504 from trunk to 0.17 branch. Fixes: HADOOP-3477.

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

CHANGES.txt

@@ -14,6 +14,10 @@ Release 0.17.1
     HADOOP-3442. Limit recursion depth in QuickSort to avoid
     StackOverflowErrors. (cdouglas)
 
+    HADOOP-3477. Fix build to not package contrib/*/bin twice in
+    distributions.  (Adam Heath via cutting)
+
+
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

build.xml

@@ -844,6 +844,7 @@
       <param.listofitems>
         <tarfileset dir="${build.dir}" mode="664">
           <exclude name="${final.name}/bin/*" />
+          <exclude name="${final.name}/contrib/*/bin/*" />
           <exclude name="${final.name}/src/contrib/ec2/bin/*" />
           <exclude name="${final.name}/src/contrib/ec2/bin/image/*" />
           <include name="${final.name}/**" />