# HG changeset patch
# User Steve Borho <steve@borho.org>
# Date 1300471278 18000
# Node ID 136854393eedba47fa226775058aa186d3043bd2
# Parent  4f5ed2bd17240f5ffc25691d36cdbb61fdde4b97# Parent  a083c6e62acbf9a9389df26fe3af47352161cec3
merge with stable

diff -r 4f5ed2bd1724 -r 136854393eed contrib/wix/guids.wxi
--- a/contrib/wix/guids.wxi	Thu Mar 17 17:08:13 2011 -0500
+++ b/contrib/wix/guids.wxi	Fri Mar 18 13:01:18 2011 -0500
@@ -29,7 +29,7 @@
   <?define templates.coal.guid = {B63CCAAB-4EAF-43b4-901E-4BD13F5B78FC} ?>
   <?define templates.gitweb.guid = {D8BFE3ED-06DD-4C4D-A00D-6D825955F922} ?>
   <?define templates.monoblue.guid = {A394B4D5-2AF7-4AAC-AEA8-E92176E5501E} ?>
-  <?define templates.paper.guid = {7C94B80D-FD0D-44E7-8489-F30A9E20A47F} ?>
+  <?define templates.paper.guid = {243CF61D-7028-4A25-93CC-7C402088EAE6} ?>
   <?define templates.raw.guid = {04DE03A2-FBFD-4c5f-8DEA-5436DDF4689D} ?>
   <?define templates.rss.guid = {A7D608DE-0CF6-44f4-AF1E-EE30CC237FDA} ?>
   <?define templates.spartan.guid = {80222625-FA8F-44b1-86CE-1781EF375D09} ?>
diff -r 4f5ed2bd1724 -r 136854393eed contrib/wix/templates.wxs
--- a/contrib/wix/templates.wxs	Thu Mar 17 17:08:13 2011 -0500
+++ b/contrib/wix/templates.wxs	Fri Mar 18 13:01:18 2011 -0500
@@ -112,6 +112,7 @@
         <Directory Id="templates.paperdir" Name="paper">
           <Component Id="templates.paper" Guid="$(var.templates.paper.guid)" Win64='$(var.IsX64)'>
             <File Id="paper.branches.tmpl"      Name="branches.tmpl" KeyPath="yes" />
+            <File Id="paper.bookmarks.tmpl"     Name="bookmarks.tmpl" />
             <File Id="paper.changeset.tmpl"     Name="changeset.tmpl" />
             <File Id="paper.error.tmpl"         Name="error.tmpl" />
             <File Id="paper.fileannotate.tmpl"  Name="fileannotate.tmpl" />