svn merge -c -1399791 for reverting HADOOP-8823 since 1.0.4 is already released.

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

CHANGES.txt

@@ -12,8 +12,6 @@ Release 1.0.4 - 2012.10.02
     MAPREDUCE-4399. Change the Jetty response buffer size to improve 
     shuffle performance. (Luke Lu via suresh)
 
-    HADOOP-8823. ant package target should not depend on cn-docs. (szetszwo)
-
   BUG FIXES
 
     HDFS-3652. FSEditLog failure removes the wrong edit stream when storage

build.xml

@@ -1494,7 +1494,7 @@
   <!-- ================================================================== -->
   <!--                                                                    -->
   <!-- ================================================================== -->
-  <target name="package" depends="compile, jar, javadoc, docs, api-report, examples, tools-jar, jar-test, ant-tasks, package-librecordio"
+  <target name="package" depends="compile, jar, javadoc, docs, cn-docs, api-report, examples, tools-jar, jar-test, ant-tasks, package-librecordio"
 	  description="assembles multi-platform artifacts for distribution">
     <delete dir="${dist.dir}"/>
     <mkdir dir="${dist.dir}"/>