More merges

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

WHATSNEW

@@ -18,9 +18,6 @@ Other changes:
 * Enable to choose the regexp implementation without system property.
   Bugzilla Report 15390.
 
-* <nice> task lets you set the priority of the current thread; non-forking
-  <java> code will inherit this priority in their main thread.
-
 * A new roundup attribute on <zip> and related task can be used to
   control whether the file modification times inside the archive will
   be rounded up or down (since zips only store modification times with
@@ -32,8 +29,6 @@ Other changes:
   nested FileNameMapper implementations directly, allowing a usage
   comparable to those of <condition>, <filter>, and <selector>.
 
-* New attribute "negate" on <propertyset> to invert selection criteria.
-
 * New <redirector> type introduced to provide extreme I/O flexibility.
   Initial support for <exec>, <apply>, and <java> tasks.
 
@@ -157,6 +152,11 @@ Other changes:
 
 * <touch> has filelist support.
 
+* <nice> task lets you set the priority of the current thread; non-forking
+  <java> code will inherit this priority in their main thread.
+
+* New attribute "negate" on <propertyset> to invert selection criteria.
+
 Changes from Ant 1.6.0 to Ant 1.6.1
 =============================================