diff --git a/core/pom.xml b/core/pom.xml
index aeddd7c512..8b76f66220 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -236,7 +236,7 @@
     <dependency>
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>stapler</artifactId>
-      <version>1.22</version>
+      <version>1.23-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.kohsuke</groupId>
diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index f5a5f0c9e5..0296fd5f0d 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -328,10 +328,23 @@ public class Functions {
         return Util.encode(s);
     }
 
-    public void adminCheck(StaplerRequest req, StaplerResponse rsp,boolean required) throws IOException, ServletException {
+    public static void adminCheck(StaplerRequest req, StaplerResponse rsp,boolean required) throws IOException, ServletException {
         if(required && !Hudson.adminCheck(req,rsp)) {
             // check failed
             throw new ServletException("Unauthorized access");
         }
     }
+
+    /**
+     * Infers the hudson installation URL from the given request.
+     */
+    public static String inferHudsonURL(StaplerRequest req) {
+        StringBuilder buf = new StringBuilder();
+        buf.append(req.getScheme()).append("://");
+        buf.append(req.getServerName());
+        if(req.getLocalPort()!=80)
+            buf.append(':').append(req.getLocalPort());
+        buf.append('/').append(req.getContextPath());
+        return buf.toString();
+    }
 }
diff --git a/core/src/main/resources/lib/hudson/buildProgressBar.jelly b/core/src/main/resources/lib/hudson/buildProgressBar.jelly
index 4bcc41ce04..17f473e607 100644
--- a/core/src/main/resources/lib/hudson/buildProgressBar.jelly
+++ b/core/src/main/resources/lib/hudson/buildProgressBar.jelly
@@ -7,10 +7,5 @@
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <j:set var="id" value="${h.generateId()}"/>
   <t:progressBar id="${id}" pos="${build.executor.progress}" href="${rootURL}/${build.url}console"/>
-  <script>
-    new YAHOO.widget.Tooltip("tooltip-${id}", {
-	    context:"${id}",
-      text:"Started ${build.timestampString} ago&lt;br> Estimated remaining time: ${build.executor.estimatedRemainingTime}",
-	    showDelay:500 } );
-  </script>
+  <t:tooltip id="${id}">Started ${build.timestampString} ago&lt;br> Estimated remaining time: ${build.executor.estimatedRemainingTime}</t:tooltip>
 </j:jelly>
diff --git a/core/src/main/resources/lib/hudson/queue.jelly b/core/src/main/resources/lib/hudson/queue.jelly
index 729b313432..f4d58173ec 100644
--- a/core/src/main/resources/lib/hudson/queue.jelly
+++ b/core/src/main/resources/lib/hudson/queue.jelly
@@ -30,12 +30,7 @@
               <a href="${rootURL}/${item.project.url}">
                 ${item.project.name}
               </a>
-              <script>
-                new YAHOO.widget.Tooltip("tooltip-${id}", {
-                  context:"${id}",
-                  text:"${item.why}",
-                  showDelay:500 } );
-              </script>
+              <t:tooltip id="${id}">${item.why}</t:tooltip>
             </td>
             <td class="pane" width="16" align="center" valign="middle">
               <l:isAdmin>
diff --git a/core/src/main/resources/lib/hudson/tooltip.jelly b/core/src/main/resources/lib/hudson/tooltip.jelly
new file mode 100644
index 0000000000..199bc34e70
--- /dev/null
+++ b/core/src/main/resources/lib/hudson/tooltip.jelly
@@ -0,0 +1,21 @@
+<!--
+  generates script fragment to display a tooltip
+
+  Attributes:
+    @id: HTML ID of the target of the popup. For ID generation you can use:
+         <j:set var="id" value="${h.generateId()}"/>
+  Body:
+    HTML to be displayed as tooltip. Note that there cannot be any newline in it,
+    so you have to write <t:tooltip>...</t:tooltip>, not
+    <t:tooltip>
+      ...
+    </t:tooltip>
+-->
+<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">
+  <script>
+    new YAHOO.widget.Tooltip("tooltip-${id}", {
+      context:"${id}",
+      text:"<d:invokeBody/>",
+      showDelay:500 } );
+  </script>
+</j:jelly>    
\ No newline at end of file