# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1238172918 18000
# Node ID de5b1753e8659bb5269dbfac9fb61ee2395e5dc3
# Parent  c3c5b964901e360a4521c09e1bee6f16d378b362# Parent  9e8e5292acaae158e2a5019fbee018e804aae452
Merge

diff -r 9e8e5292acaa -r de5b1753e865 web/hgbook/templates/boilerplate.html
--- a/web/hgbook/templates/boilerplate.html	Fri Mar 27 00:41:15 2009 -0700
+++ b/web/hgbook/templates/boilerplate.html	Fri Mar 27 11:55:18 2009 -0500
@@ -24,9 +24,14 @@
 	  href="http://mattahan.deviantart.com/">Mattahan</a>.</p>
     </div>
 
-    <script src="http://www.google-analytics.com/urchin.js"
-      type="text/javascript"></script>
-    <script type="text/javascript">_uacct = "UA-1805907-3";
-      urchinTracker();</script>
+    <script type="text/javascript">
+    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+    </script>
+    <script type="text/javascript">
+    try {
+    var pageTracker = _gat._getTracker("UA-1805907-5");
+    pageTracker._trackPageview();
+    } catch(err) {}</script>
   </body>
 </html>
diff -r 9e8e5292acaa -r de5b1753e865 xsl/base-html-stylesheet.xsl
--- a/xsl/base-html-stylesheet.xsl	Fri Mar 27 00:41:15 2009 -0700
+++ b/xsl/base-html-stylesheet.xsl	Fri Mar 27 11:55:18 2009 -0500
@@ -114,7 +114,14 @@
   </xsl:template>
 
   <xsl:template name="user.footer.navigation">
-    <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
-    <script type="text/javascript">_uacct = "UA-1805907-3"; urchinTracker();</script>
+    <script type="text/javascript">
+    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+    </script>
+    <script type="text/javascript">
+    try {
+    var pageTracker = _gat._getTracker("UA-1805907-5");
+    pageTracker._trackPageview();
+    } catch(err) {}</script>
   </xsl:template>
 </xsl:stylesheet>