diff --git a/cli/pom.xml b/cli/pom.xml
index b3ca038565..3d58aa1d4a 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jvnet.hudson.main</groupId>
-    <version>1.313-SNAPSHOT</version>
+    <version>1.314-SNAPSHOT</version>
   </parent>
   <artifactId>cli</artifactId>
   <name>Hudson CLI</name>
diff --git a/core/pom.xml b/core/pom.xml
index 7ad3b67b08..d94cb065c0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.313-SNAPSHOT</version>
+    <version>1.314-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index 65efd55d2c..43b92ef41f 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -581,6 +581,15 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
     public String getId() {
         return ID_FORMATTER.get().format(new Date(timestamp));
     }
+    
+    /**
+     * Get the date formatter used to convert the directory name in to a timestamp
+     * This is nasty exposure of private data, but needed all the time the directory
+     * containing the build is used as it's timestamp.
+     */
+    public static DateFormat getIDFormatter() {
+    	return ID_FORMATTER.get();
+    }
 
     public Descriptor getDescriptorByName(String className) {
         return Hudson.getInstance().getDescriptorByName(className);
diff --git a/core/src/main/resources/lib/hudson/queue.jelly b/core/src/main/resources/lib/hudson/queue.jelly
index bece4aeceb..d101a27f19 100644
--- a/core/src/main/resources/lib/hudson/queue.jelly
+++ b/core/src/main/resources/lib/hudson/queue.jelly
@@ -65,9 +65,10 @@ THE SOFTWARE.
                     ${item.task.fullDisplayName}
                   </a>
                   <j:if test="${stuck}">
-                    <span title="${%Starving for a free executor. Time to add more slaves!}">
-                      &#160;<img src="${imagesURL}/${subIconSize}/hourglass.gif" />
-                    </span>
+                    &#160;
+                    <a href="http://wiki.hudson-ci.org/display/HUDSON/Executor+Starvation">
+                      <img src="${imagesURL}/16x16/hourglass.gif"  />
+                    </a>
                   </j:if>
                 </j:when>
                 <j:otherwise>
diff --git a/debian/changelog b/debian/changelog
index efef147e98..1c8cb54c89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hudson (1.313) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Fri, 26 Jun 2009 18:20:52 -0700
+
 hudson (1.312) unstable; urgency=low
 
   * See http://hudson.dev.java.net/changelog.html for more details.
diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml
index 334ce6d873..7a8d609e68 100644
--- a/maven-agent/pom.xml
+++ b/maven-agent/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.313-SNAPSHOT</version>
+    <version>1.314-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml
index cc42e9076d..7d617859ac 100644
--- a/maven-interceptor/pom.xml
+++ b/maven-interceptor/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.313-SNAPSHOT</version>
+    <version>1.314-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 43c991afc5..8d151f0013 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.313-SNAPSHOT</version>
+    <version>1.314-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 1e0e05197b..afda3c1fa8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
   
   <groupId>org.jvnet.hudson.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.313-SNAPSHOT</version>
+  <version>1.314-SNAPSHOT</version>
   <packaging>pom</packaging>
   
   <name>Hudson main module</name>
diff --git a/push-m2-repo.rb b/push-m2-repo.rb
index cf25c848cb..7edc2fdeeb 100644
--- a/push-m2-repo.rb
+++ b/push-m2-repo.rb
@@ -70,6 +70,9 @@ Dir.chdir("../plugins") do
     next unless File.exists?(name+"/pom.xml")
     updatePom(name+"/pom.xml",prev,ver)
   end
+  # in case anyone gets out of sync, this will bring them back to the current version,
+  # except that this only works for children nominated in the <module> section.
+  system "mvn -N versions:update-child-modules" or fail
   system "svn commit -m 'bumping up POM version'" or fail
   system "mvn -N deploy" or fail
-end
\ No newline at end of file
+end
diff --git a/remoting/pom.xml b/remoting/pom.xml
index 53516386c6..c3f3db8b6b 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.313-SNAPSHOT</version>
+    <version>1.314-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/test/pom.xml b/test/pom.xml
index a5ad13f900..259a43f887 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jvnet.hudson.main</groupId>
-    <version>1.313-SNAPSHOT</version>
+    <version>1.314-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jvnet.hudson.main</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index 26e86e1b28..b03fdb9ee4 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.313-SNAPSHOT</version>
+    <version>1.314-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/war/resources/images/16x16/hourglass.gif b/war/resources/images/16x16/hourglass.gif
index aa2d78f5fc..0b16a93e76 100644
Binary files a/war/resources/images/16x16/hourglass.gif and b/war/resources/images/16x16/hourglass.gif differ
diff --git a/war/resources/images/24x24/hourglass.gif b/war/resources/images/24x24/hourglass.gif
deleted file mode 100644
index 8204a6ef80..0000000000
Binary files a/war/resources/images/24x24/hourglass.gif and /dev/null differ