--- templates/htmlheader.vm.orig	2009-06-26 16:03:35.000000000 -0400
+++ templates/htmlheader.vm	2009-06-26 16:48:31.000000000 -0400
@@ -21,6 +21,8 @@
       $xwiki.getXMLEncoded($title)
     #end
     </title>
+    <link rel="shortcut icon" href="$xwiki.getSkinFile("../../favicon.ico")" type="image/x-icon">
+    <link rel="icon" href="$xwiki.getSkinFile("../../favicon.ico")" type="image/x-icon">
     <meta http-equiv="Content-Type" content="text/html; charset=$xwiki.encoding" />
     <meta http-equiv="imagetoolbar" content="no"/>
     #if($context.action=="view")