Further merges now that CVS is going a little faster

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268749 13f79535-47bb-0310-9956-ffa450edef68

WHATSNEW

@@ -1,4 +1,4 @@
-Changes from Ant 1.2 to Ant 1.3 Beta 2
+Changes from Ant 1.2 to Ant 1.3 Beta 3
 ===========================================
 
 Changes that could break older environments:
@@ -84,6 +84,9 @@ Fixed bugs:
 
 * javadoc's failonerror attribute works again
 
+* javadoc's additionalparam attribute will now be split into separate
+  parameters (on spaces) to allow for more than one parameter.
+
 * Changed <sql> task so that printing result sets works on Oracle
 
 * Changes to ddcreator and ejbc helper to respect the descriptor hierarchy

build.xml

@@ -605,6 +605,7 @@
     <delete dir="${tests.etc.dir}/taskdefs/taskdefs.tmp" />
     <delete dir="${tests.etc.dir}/taskdefs.tmp" />
     <delete file="${tests.etc.dir}/taskdefs/tmp.jar" />
+    <delete dir="${tests.etc.dir}/types/copytest" />
   </target>
 
   <target name="run-single-test" if="testcase" depends="compile-tests">