Merge remote branch 'origin/1.408' into rc

Conflicts:
	changelog.html

changelog.html

@@ -61,7 +61,7 @@ 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.408>What's new in 1.408</a> <!--=DATE=--></h3>
+<h3><a name=v1.409>What's new in 1.409</a> <!--=DATE=--></h3>
 <ul class=image>
   <li class=bug>
     Some french strings are incorrect after renaming to Jenkins
@@ -92,6 +92,13 @@ Upcoming changes</a>
     Added "about Jenkins" screen that shows the 3rd party license acknowledgement.
 </ul>
 </div><!--=END=-->
+<h3><a name=v1.408>What's new in 1.408</a> (2011/04/18)</h3>
+<ul class=image>
+  <li class='major bug'>
+    Fixed a regression that resulted in too much escaping
+    (<a href="http://issues.jenkins-ci.org/browse/JENKINS-9426">issue 9426</a>)
+</ul>
+</div><!--=END=-->
 <h3><a name=v1.407>What's new in 1.407</a> (2011/04/15)</h3>
 <ul class=image>
   <li class='major bug'>

core/pom.xml

@@ -601,11 +601,6 @@ THE SOFTWARE.
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.jvnet.hudson</groupId>
-      <artifactId>commons-jelly</artifactId>
-      <version>1.1-hudson-20100305</version>
-    </dependency>
     <dependency>
       <groupId>org.jvnet.hudson</groupId>
       <artifactId>commons-jexl</artifactId>

core/src/main/resources/hudson/model/Cause/UpstreamCause/description.jelly

@@ -24,5 +24,5 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
     <!-- upstreamUrl added in 1.284, so handle missing value -->
-    <span>${it.upstreamUrl!=null ? "%started_by_project(it.upstreamProject,it.upstreamBuild.toString(),it.upstreamUrl,rootURL)" : it.shortDescription}</span>
+    <span><j:out value='${it.upstreamUrl!=null ? "%started_by_project(it.upstreamProject,it.upstreamBuild.toString(),it.upstreamUrl,rootURL)" : it.shortDescription}' /></span>
 </j:jelly>