merge -r 1303026:1303027 from branch-1 onto branch-1.0. Fixes HADOOP-8188.

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

CHANGES.txt

@@ -8,6 +8,9 @@ Hadoop Change Log
     HADOOP-6941. Adds support for building Hadoop with IBM's JDK
     (Stephen Watt, Eli and ddas)
 
+    HADOOP-8188. Fixes the build process to do with jsvc, with IBM's JDK 
+    as the underlying jdk. (ddas)
+
 Release 1.0.2 - 2012.03.18
 
   NEW FEATURES

build.xml

@@ -183,6 +183,7 @@
       <os arch="i486" />
       <os arch="i586" />
       <os arch="i686" />
+      <os arch="x86" />
     </or>
   </condition>
   <property name="jsvc.location" value="http://archive.apache.org/dist/commons/daemon/binaries/1.0.2/linux/commons-daemon-1.0.2-bin-linux-${os-arch}.tar.gz" />