merged back the RC branch

Conflicts:
	core/src/main/java/hudson/tools/InstallerTranslator.java

changelog.html

@@ -66,7 +66,10 @@ Upcoming changes</a>
 
 <!-- these changes are controlled by the release process. DO NOT MODIFY -->
 <div id="rc" style="display:none;"><!--=BEGIN=-->
-<h3><a name=v1.573>What's new in 1.573</a> <!--=DATE=--></h3>
+<h3><a name=v1.574>What's new in 1.574</a> <!--=DATE=--></h3>
+<!--=RC-CHANGES=-->
+</div><!--=END=-->
+<h3><a name=v1.573>What's new in 1.573</a> (2014/07/20)</h3>
 <ul class=image>
   <li class="rfe">
     UI redesign: Changed element alignment, removed sidebar link underlines
@@ -82,7 +85,6 @@ Upcoming changes</a>
     Fixed unnecessary eager loading of build records in certain code path.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-18065">issue 18065</a>)
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.572>What's new in 1.572</a> (2014/07/13)</h3>
 <ul class=image>
   <li class="major rfe">

core/src/main/java/hudson/tools/InstallerTranslator.java

@@ -50,7 +50,6 @@ public class InstallerTranslator extends ToolLocationTranslator {
         if (isp == null) {
             return null;
         }
-
         for (ToolInstaller installer : isp.installers) {
             if (installer.appliesTo(node)) {
                 Semaphore semaphore;

debian/debian/changelog

+jenkins (1.573) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Sun, 20 Jul 2014 13:31:21 -0700
+
 jenkins (1.572) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.