# HG changeset patch
# User Steve Borho <steve@borho.org>
# Date 1293773810 21600
# Node ID 637d07d8e377321999734bcd70bab9b0003c3d82
# Parent  d85d8ad88de938f4a6a5a0e3818eab70fc0c2ec0# Parent  e5c2338d76b5ab9f0925c6982b9ebb5fcecdb302
merge with stable

diff -r d85d8ad88de9 -r 637d07d8e377 contrib/wix/guids.wxi
--- a/contrib/wix/guids.wxi	Wed Dec 29 15:31:25 2010 -0600
+++ b/contrib/wix/guids.wxi	Thu Dec 30 23:36:50 2010 -0600
@@ -44,6 +44,8 @@
   <?define COPYING.guid = {B7801DBA-1C49-4BF4-91AD-33C65F5C7895} ?>
   <?define mercurial.rc.guid = {1D5FAEEE-7E6E-43B1-9F7F-802714316B15} ?>
   <?define mergetools.rc.guid = {E8A1DC29-FF40-4B5F-BD12-80B9F7BF0CCD} ?>
+  <?define paths.rc.guid = {F9ADF21D-5F0B-4934-8CD9-14BE63664721} ?>
+  <?define cacert.pem.guid = {EC1B2630-FE21-46E6-915B-A6545AF703D4} ?>
   <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?>
   <?define hgcmd.guid = {65CCC756-E72E-4C5F-901E-D575EDC80DB3} ?>
 
diff -r d85d8ad88de9 -r 637d07d8e377 contrib/wix/mercurial.wxs
--- a/contrib/wix/mercurial.wxs	Wed Dec 29 15:31:25 2010 -0600
+++ b/contrib/wix/mercurial.wxs	Thu Dec 30 23:36:50 2010 -0600
@@ -82,6 +82,15 @@
               <File Id='mergetools.rc' Name='MergeTools.rc' Source='contrib\mergetools.hgrc'
                     ReadOnly='yes' KeyPath='yes'/>
             </Component>
+            <Component Id='paths.rc' Guid='$(var.paths.rc.guid)' Win64='$(var.IsX64)'>
+              <CreateFolder/>
+              <IniFile Id="ini0" Action="createLine" Directory="HGRCD" Name="Paths.rc"
+                Section="web" Key="cacerts" Value="[INSTALLDIR]hgrc.d\cacert.pem" />
+            </Component>
+            <Component Id='cacert.pem' Guid='$(var.cacert.pem.guid)' Win64='$(var.IsX64)'>
+              <File Id='cacert.pem' Name='cacert.pem' Source='..\misc\cacert.pem'
+                    ReadOnly='yes' KeyPath='yes'/>
+            </Component>
           </Directory>
 
           <Directory Id='binFolder' Name='bin'>
@@ -128,6 +137,8 @@
         <ComponentRef Id='COPYING' />
         <ComponentRef Id='mercurial.rc' />
         <ComponentRef Id='mergetools.rc' />
+        <ComponentRef Id='paths.rc' />
+        <ComponentRef Id='cacert.pem' />
         <ComponentRef Id='helpFolder' />
         <ComponentRef Id='HgCmd' />
         <ComponentGroupRef Id='templatesFolder' />