merged back the RC branch

changelog.html

@@ -64,7 +64,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.496>What's new in 1.496</a> <!--=DATE=--></h3>
+<h3><a name=v1.497>What's new in 1.497</a> <!--=DATE=--></h3>
+<!--=RC-CHANGES=-->
+</div><!--=END=-->
+<h3><a name=v1.496>What's new in 1.496</a> (2012/12/30)</h3>
 <ul class=image>
   <li class=bug>
     Aborting download of workspace files make Jenkins unstable
@@ -76,7 +79,6 @@ Upcoming changes</a>
      Channel is already closed exception during threadDump
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-16193">issue 16193</a>)  
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.495>What's new in 1.495</a> (2012/12/24)</h3>
 <ul class=image>
   <li class=bug>

debian/debian/changelog

+jenkins (1.496) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Sun, 30 Dec 2012 14:30:13 -0800
+
 jenkins (1.495) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.