merged back the RC branch

Conflicts:
	war/pom.xml

changelog.html

@@ -76,7 +76,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.468>What's new in 1.468</a> <!--=DATE=--></h3>
+<h3><a name=v1.469>What's new in 1.469</a> <!--=DATE=--></h3>
+<!--=RC-CHANGES=-->
+</div><!--=END=-->
+<h3><a name=v1.468>What's new in 1.468</a> (2012/06/11)</h3>
 <ul class=image>
   <li class=bug>
     Added more MIME type mapping for Winstone.
@@ -100,7 +103,6 @@ Upcoming changes</a>
   <li class=rfe>
     Improved the background transparency of the animating ball icon
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.467>What's new in 1.467</a> (2012/06/04)</h3>
 <ul class=image>
   <li class=bug>

debian/debian/changelog

+jenkins (1.468) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Mon, 11 Jun 2012 09:43:38 -0700
+
 jenkins (1.467) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.

war/pom.xml

@@ -287,7 +287,7 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>ldap</artifactId>
-                  <version>1.0</version>
+                  <version>1.1</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>