Set svn:eol-style on a bunch of text-looking files that didn't have it

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19972 dc483132-0cff-0310-8789-dd5450dbe970

5 files changed, 499 insertions, 499 deletions

diff --git a/src/windows/installer/wix/lang/license.rtf b/src/windows/installer/wix/lang/license.rtf
index b28c080267..dd7b0b6ea1 100644
--- a/src/windows/installer/wix/lang/license.rtf
+++ b/src/windows/installer/wix/lang/license.rtf
@@ -1,102 +1,102 @@
-{\rtf1\ansi\ansicpg1252\deff0\deflang1033\deflangfe1033{\fonttbl{\f0\fmodern\fprq1\fcharset0 Courier New;}{\f1\froman\fprq2\fcharset0 Times New Roman;}}

-{\*\generator Msftedit 5.41.15.1507;}\viewkind4\uc1\pard\nowidctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\f0\fs20 Copyright Notice and Legal Administrivia\par

-----------------------------------------\par

-\par

-Copyright (C) 1985-2005 by the Massachusetts Institute of Technology.\par

-\par

-All rights reserved.\par

-\par

-Export of this software from the United States of America may require a specific license from the United States Government.  It is the responsibility of any person or organization contemplating export to obtain such a license before exporting.\par

-\par

-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and\par

-this permission notice appear in supporting documentation, and that the name of M.I.T. not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission.  Furthermore if you modify this software you must label your software as modified software and not distribute it in such a fashion that it might be confused with the original MIT software. M.I.T. makes no representations about the suitability of this software for any purpose.  It is provided "as is" without express or implied warranty.\par

-\par

-THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.\par

-\par

-Individual source code files are copyright MIT, Cygnus Support, OpenVision, Oracle, Sun Soft, FundsXpress, and others.\par

-\par

-Project Athena, Athena, Athena MUSE, Discuss, Hesiod, Kerberos, Moira, and Zephyr are trademarks of the Massachusetts Institute of Technology (MIT).  No commercial use of these trademarks may be made without prior written permission of MIT.\par

-\par

-"Commercial use" means use of a name in a product or other for-profit manner.  It does NOT prevent a commercial firm from referring to the MIT trademarks in order to convey information (although in doing so, recognition of their trademark status should be given).\par

-\par

-----\par

-\par

-The following copyright and permission notice applies to the OpenVision Kerberos Administration system located in kadmin/create, kadmin/dbutil, kadmin/passwd, kadmin/server, lib/kadm5, and portions of lib/rpc:\par

-\par

-Copyright, OpenVision Technologies, Inc., 1996, All Rights Reserved\par

-\par

-WARNING: Retrieving the OpenVision Kerberos Administration system source code, as described below, indicates your acceptance of the following terms.  If you do not agree to the following terms, do not retrieve the OpenVision Kerberos administration system.\par

-\par

-You may freely use and distribute the Source Code and Object Code compiled from it, with or without modification, but this Source Code is provided to you "AS IS" EXCLUSIVE OF ANY WARRANTY, INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY OTHER WARRANTY, WHETHER EXPRESS OR IMPLIED.  IN NO EVENT WILL OPENVISION HAVE ANY LIABILITY FOR ANY LOST PROFITS, LOSS OF DATA OR COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, INCLUDING, WITHOUT LIMITATION, THOSE RESULTING FROM THE USE OF THE SOURCE CODE, OR THE FAILURE OF THE SOURCE CODE TO PERFORM, OR FOR ANY OTHER REASON.\par

-\par

-OpenVision retains all copyrights in the donated Source Code. OpenVision also retains copyright to derivative works of the Source Code, whether created by OpenVision or by a third party. The OpenVision copyright notice must be preserved if derivative works are made based on the donated Source Code.\par

-\par

-OpenVision Technologies, Inc. has donated this Kerberos Administration system to MIT for inclusion in the standard Kerberos 5 distribution.  This donation underscores our commitment to continuing Kerberos technology development and our gratitude for the valuable work which has been performed by MIT and the Kerberos community.\par

-\par

-----\par

-\par

-Portions contributed by Matt Crawford <crawdad@fnal.gov> were work performed at Fermi National Accelerator Laboratory, which is operated by Universities Research Association, Inc., under contract DE-AC02-76CHO3000 with the U.S. Department of Energy.\par

-\par

-\pard ----\f1\fs24\par

-\pard\nowidctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\f0\fs20\par

-The implementation of the Yarrow pseudo-random number generator in src/lib/crypto/yarrow has the following copyright:\par

-\par

-Copyright 2000 by Zero-Knowledge Systems, Inc.\par

-\par

-Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of Zero-Knowledge Systems, Inc. not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission.  Zero-Knowledge Systems, Inc. makes no representations about the suitability of this software for any purpose.  It is provided "as is" without express or implied warranty.\par

-\par

-ZERO-KNOWLEDGE SYSTEMS, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL ZERO-KNOWLEDGE SYSTEMS, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN\par

-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\par

-\par

-\pard ----\f1\fs24\par

-\pard\nowidctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\f0\fs20\par

-The implementation of the AES encryption algorithm in src/lib/crypto/aes has the following copyright:\par

-\par

-Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK.\par

-All rights reserved.\par

-\par

-LICENSE TERMS\par

-\par

-The free distribution and use of this software in both source and binary form is allowed (with or without changes) provided that:\par

-\par

-1. distributions of this source code include the above copyright notice, this list of conditions and the following disclaimer;\par

-\par

-2. distributions in binary form include the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other associated materials;\par

-\par

-3. the copyright holder's name is not used to endorse products built using this software without specific written permission. \par

-\par

-DISCLAIMER\par

-\par

-This software is provided 'as is' with no explcit or implied warranties in respect of any properties, including, but not limited to, correctness and fitness for purpose.\par

-\par

-\par

-\par

-Acknowledgements\par

-----------------\par

-\par

-Appreciation Time!!!!  There are far too many people to try to thank them all; many people have contributed to the development of Kerberos V5.  This is only a partial listing....\par

-\par

-Thanks to Paul Vixie and the Internet Software Consortium for funding the work of Barry Jaspan.  This funding was invaluable for the OV administration server integration, as well as the 1.0 release preparation process.\par

-\par

-Thanks to John Linn, Scott Foote, and all of the folks at OpenVision Technologies, Inc., who donated their administration server for use in the MIT release of Kerberos.\par

-\par

-Thanks to Jeff Bigler, Mark Eichin, Marc Horowitz, Nancy Gilman, Ken Raeburn, and all of the folks at Cygnus Support, who provided innumerable bug fixes and portability enhancements to the Kerberos V5 tree.  Thanks especially to Jeff Bigler, for the new user and system administrator's documentation.\par

-\par

-Thanks to Doug Engert from ANL for providing many bug fixes, as well as testing to ensure DCE interoperability.\par

-\par

-Thanks to Ken Hornstein at NRL for providing many bug fixes and suggestions, and for working on SAM preauthentication.\par

-\par

-Thanks to Matt Crawford at FNAL for bugfixes and enhancements.\par

-\par

-Thanks to Sean Mullan and Bill Sommerfeld from Hewlett Packard for their many suggestions and bug fixes.\par

-\par

-Thanks to Nalin Dahyabhai of RedHat and Chris Evans for locating and providing patches for numerous buffer overruns.\par

-\par

-Thanks to Christopher Thompson and Marcus Watts for discovering the ftpd security bug.\par

-\par

-Thanks to Paul Nelson of Thursby Software Systems for implementing the Microsoft set password protocol.\par

-\par

-Thanks to the members of the Kerberos V5 development team at MIT, both past and present: Danilo Almeida, Jeffrey Altman, Jay Berkenbilt, Richard Basch, Mitch Berger, John Carr, Don Davis, Alexandra Ellwood, Nancy Gilman, Matt Hancher, Sam Hartman, Paul Hill, Marc Horowitz, Eva Jacobus, Miroslav Jurisic, Barry Jaspan, Geoffrey King, John Kohl, Peter Litwack, Scott McGuire, Kevin Mitchell, Cliff Neuman, Paul Park, Ezra Peisach, Chris Provenzano, Ken Raeburn, Jon Rochlis, Jeff Schiller, Jen Selby, Brad Thompson, Harry Tsai, Ted Ts'o, Marshall Vale, Tom Yu.\par

-\pard\nowidctlpar\f1\fs24\par

-}

+{\rtf1\ansi\ansicpg1252\deff0\deflang1033\deflangfe1033{\fonttbl{\f0\fmodern\fprq1\fcharset0 Courier New;}{\f1\froman\fprq2\fcharset0 Times New Roman;}}
+{\*\generator Msftedit 5.41.15.1507;}\viewkind4\uc1\pard\nowidctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\f0\fs20 Copyright Notice and Legal Administrivia\par
+----------------------------------------\par
+\par
+Copyright (C) 1985-2005 by the Massachusetts Institute of Technology.\par
+\par
+All rights reserved.\par
+\par
+Export of this software from the United States of America may require a specific license from the United States Government.  It is the responsibility of any person or organization contemplating export to obtain such a license before exporting.\par
+\par
+WITHIN THAT CONSTRAINT, permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and\par
+this permission notice appear in supporting documentation, and that the name of M.I.T. not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission.  Furthermore if you modify this software you must label your software as modified software and not distribute it in such a fashion that it might be confused with the original MIT software. M.I.T. makes no representations about the suitability of this software for any purpose.  It is provided "as is" without express or implied warranty.\par
+\par
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.\par
+\par
+Individual source code files are copyright MIT, Cygnus Support, OpenVision, Oracle, Sun Soft, FundsXpress, and others.\par
+\par
+Project Athena, Athena, Athena MUSE, Discuss, Hesiod, Kerberos, Moira, and Zephyr are trademarks of the Massachusetts Institute of Technology (MIT).  No commercial use of these trademarks may be made without prior written permission of MIT.\par
+\par
+"Commercial use" means use of a name in a product or other for-profit manner.  It does NOT prevent a commercial firm from referring to the MIT trademarks in order to convey information (although in doing so, recognition of their trademark status should be given).\par
+\par
+----\par
+\par
+The following copyright and permission notice applies to the OpenVision Kerberos Administration system located in kadmin/create, kadmin/dbutil, kadmin/passwd, kadmin/server, lib/kadm5, and portions of lib/rpc:\par
+\par
+Copyright, OpenVision Technologies, Inc., 1996, All Rights Reserved\par
+\par
+WARNING: Retrieving the OpenVision Kerberos Administration system source code, as described below, indicates your acceptance of the following terms.  If you do not agree to the following terms, do not retrieve the OpenVision Kerberos administration system.\par
+\par
+You may freely use and distribute the Source Code and Object Code compiled from it, with or without modification, but this Source Code is provided to you "AS IS" EXCLUSIVE OF ANY WARRANTY, INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY OTHER WARRANTY, WHETHER EXPRESS OR IMPLIED.  IN NO EVENT WILL OPENVISION HAVE ANY LIABILITY FOR ANY LOST PROFITS, LOSS OF DATA OR COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, INCLUDING, WITHOUT LIMITATION, THOSE RESULTING FROM THE USE OF THE SOURCE CODE, OR THE FAILURE OF THE SOURCE CODE TO PERFORM, OR FOR ANY OTHER REASON.\par
+\par
+OpenVision retains all copyrights in the donated Source Code. OpenVision also retains copyright to derivative works of the Source Code, whether created by OpenVision or by a third party. The OpenVision copyright notice must be preserved if derivative works are made based on the donated Source Code.\par
+\par
+OpenVision Technologies, Inc. has donated this Kerberos Administration system to MIT for inclusion in the standard Kerberos 5 distribution.  This donation underscores our commitment to continuing Kerberos technology development and our gratitude for the valuable work which has been performed by MIT and the Kerberos community.\par
+\par
+----\par
+\par
+Portions contributed by Matt Crawford <crawdad@fnal.gov> were work performed at Fermi National Accelerator Laboratory, which is operated by Universities Research Association, Inc., under contract DE-AC02-76CHO3000 with the U.S. Department of Energy.\par
+\par
+\pard ----\f1\fs24\par
+\pard\nowidctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\f0\fs20\par
+The implementation of the Yarrow pseudo-random number generator in src/lib/crypto/yarrow has the following copyright:\par
+\par
+Copyright 2000 by Zero-Knowledge Systems, Inc.\par
+\par
+Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of Zero-Knowledge Systems, Inc. not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission.  Zero-Knowledge Systems, Inc. makes no representations about the suitability of this software for any purpose.  It is provided "as is" without express or implied warranty.\par
+\par
+ZERO-KNOWLEDGE SYSTEMS, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL ZERO-KNOWLEDGE SYSTEMS, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN\par
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\par
+\par
+\pard ----\f1\fs24\par
+\pard\nowidctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\f0\fs20\par
+The implementation of the AES encryption algorithm in src/lib/crypto/aes has the following copyright:\par
+\par
+Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK.\par
+All rights reserved.\par
+\par
+LICENSE TERMS\par
+\par
+The free distribution and use of this software in both source and binary form is allowed (with or without changes) provided that:\par
+\par
+1. distributions of this source code include the above copyright notice, this list of conditions and the following disclaimer;\par
+\par
+2. distributions in binary form include the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other associated materials;\par
+\par
+3. the copyright holder's name is not used to endorse products built using this software without specific written permission. \par
+\par
+DISCLAIMER\par
+\par
+This software is provided 'as is' with no explcit or implied warranties in respect of any properties, including, but not limited to, correctness and fitness for purpose.\par
+\par
+\par
+\par
+Acknowledgements\par
+----------------\par
+\par
+Appreciation Time!!!!  There are far too many people to try to thank them all; many people have contributed to the development of Kerberos V5.  This is only a partial listing....\par
+\par
+Thanks to Paul Vixie and the Internet Software Consortium for funding the work of Barry Jaspan.  This funding was invaluable for the OV administration server integration, as well as the 1.0 release preparation process.\par
+\par
+Thanks to John Linn, Scott Foote, and all of the folks at OpenVision Technologies, Inc., who donated their administration server for use in the MIT release of Kerberos.\par
+\par
+Thanks to Jeff Bigler, Mark Eichin, Marc Horowitz, Nancy Gilman, Ken Raeburn, and all of the folks at Cygnus Support, who provided innumerable bug fixes and portability enhancements to the Kerberos V5 tree.  Thanks especially to Jeff Bigler, for the new user and system administrator's documentation.\par
+\par
+Thanks to Doug Engert from ANL for providing many bug fixes, as well as testing to ensure DCE interoperability.\par
+\par
+Thanks to Ken Hornstein at NRL for providing many bug fixes and suggestions, and for working on SAM preauthentication.\par
+\par
+Thanks to Matt Crawford at FNAL for bugfixes and enhancements.\par
+\par
+Thanks to Sean Mullan and Bill Sommerfeld from Hewlett Packard for their many suggestions and bug fixes.\par
+\par
+Thanks to Nalin Dahyabhai of RedHat and Chris Evans for locating and providing patches for numerous buffer overruns.\par
+\par
+Thanks to Christopher Thompson and Marcus Watts for discovering the ftpd security bug.\par
+\par
+Thanks to Paul Nelson of Thursby Software Systems for implementing the Microsoft set password protocol.\par
+\par
+Thanks to the members of the Kerberos V5 development team at MIT, both past and present: Danilo Almeida, Jeffrey Altman, Jay Berkenbilt, Richard Basch, Mitch Berger, John Carr, Don Davis, Alexandra Ellwood, Nancy Gilman, Matt Hancher, Sam Hartman, Paul Hill, Marc Horowitz, Eva Jacobus, Miroslav Jurisic, Barry Jaspan, Geoffrey King, John Kohl, Peter Litwack, Scott McGuire, Kevin Mitchell, Cliff Neuman, Paul Park, Ezra Peisach, Chris Provenzano, Ken Raeburn, Jon Rochlis, Jeff Schiller, Jen Selby, Brad Thompson, Harry Tsai, Ted Ts'o, Marshall Vale, Tom Yu.\par
+\pard\nowidctlpar\f1\fs24\par
+}
 
diff --git a/src/windows/installer/wix/platform.wxi b/src/windows/installer/wix/platform.wxi
index 3c7e7bacbc..93f1733485 100644
--- a/src/windows/installer/wix/platform.wxi
+++ b/src/windows/installer/wix/platform.wxi
@@ -1,191 +1,191 @@
-<?xml version="1.0"?>

-<Include>

-<!-- Platform specific GUID's and other definitions -->

-<?if $(var.Platform) = "x64" ?>

-        <?define UpgradeCode="6DA9CD86-6028-4852-8C94-452CAC229244"?>

-        <?define cmf_kfwlogon_DLL_guid="CFC0B7C9-9A59-4022-89B3-25E0941D0369"?>

-        <?define cmf_kfwcpcc_EXE_guid="83F51B6D-F3C6-44cf-AC91-D1D6498FFA44"?>

-        <?define cmp_ClientSystemDebug_guid="7B25B1E0-A22A-43c7-BA97-C30FCA3B1230"?>

-        <?define rcm_krb4_1_guid="B3CF770A-2C0F-44c0-8F5B-7B808369D225"?>

-        <?define rcm_krb4_2_guid="0CF5732A-7659-4cf9-8D01-7E75E6DA2639"?>                                        

-        <?define rcm_krb4_3_guid="6A279F11-E441-49cb-80F0-3D807D7230DE"?>

-        <?define rcm_krb4_4_guid="CACB3731-C532-4d28-9E44-FFF35C1376D5"?>

-        <?define rcm_krb5_1_guid="21883AD6-1C00-4f1d-9922-477CF63CE6BF"?>

-        <?define rcm_krb5_2_guid="88CEA446-4617-46bc-916F-2AAA1E1EACF8"?>

-        <?define rcm_krb5_3_guid="28BFF4DB-D09E-4031-AB5D-232F6F707A45"?>

-        <?define cmf_comerr32_dll_guid="3C34EFDA-3F93-4aa6-AA44-718AA25DD346"?>

-        <?define cmf_comerr32_dll_name="comerr64.dll"?>

-        <?define cmf_gss_exe_guid="805EBB97-4860-40d4-A038-5E56717EAFB4"?>

-        <?define cmf_gss_client_exe_guid="5F192562-436C-4800-93C7-148F7D46F521"?>

-        <?define cmf_gss_server_exe_guid="33651319-01CB-4f2c-9B96-50F0F53E9CDF"?>

-        <?define cmf_gssapi32_dll_guid="ACD1D3FA-3E96-47a6-8A39-88BDA2EA3C9D"?>

-        <?define cmf_gssapi32_dll_name="gssapi64.dll"?>

-        <?define cmf_k524init_exe_guid="63630B70-D9B1-47bc-905D-E4DFA6F9D0D1"?>

-        <?define cmf_kclnt32_dll_guid="C26B3CAA-607C-42db-956C-9AA379CCE892"?>

-        <?define cmf_kclnt32_dll_name="kclnt64.dll"?>

-        <?define cmf_kdestroy_exe_guid="58AB2858-3513-4e4d-B76C-915B0D0DEE82"?>

-        <?define cmf_kcpytkt_exe_guid="B2BA9697-4E42-433d-BA85-79A49A622D84"?>

-        <?define cmf_kdeltkt_exe_guid="998BF60D-75EF-4807-BDA3-7DDE47C4F00F"?>

-        <?define cmf_kinit_exe_guid="6855B2B9-D3EB-42ce-B0EA-EFCD5960B635"?>

-        <?define cmf_klist_exe_guid="1AE98193-6596-4460-9B42-15C734E28CE8"?>

-        <?define cmf_kpasswd_exe_guid="669A2965-413F-4003-9F43-4615CC7C3B1A"?>

-        <?define cmf_kvno_exe_guid="56C95EBA-2A53-4567-AA44-9A0EE01BB390"?>

-        <?define cmf_krb5_32_dll_guid="8B7190D6-76BD-442b-893B-1EED4E26EC0A"?>

-        <?define cmf_krb5_32_dll_name="krb5_64.dll"?>

-        <?define cmf_k5sprt32_dll_guid="2DD8CE7D-8C8E-4cfb-BC73-765858DD1418"?>

-        <?define cmf_k5sprt32_dll_name="k5sprt64.dll"?>

-        <?define cmf_krb524_dll_guid="4FAFB2A6-FC42-466b-9A86-42C3150252E2"?>

-        <?define cmf_krb524_dll_name="krb524.dll"?>

-        <?define cmf_krbcc32_dll_guid="56DAD1B9-4A59-46e6-81CA-54E2B6C9D618"?>

-        <?define cmf_krbcc32_dll_name="krbcc64.dll"?>

-        <?define cmf_krbcc32s_exe_guid="0192F58B-9129-426d-A271-E18455EDC80E"?>

-        <?define cmf_krbcc32s_exe_name="krbcc64s.exe"?>

-        <?define cmf_krbv4w32_dll_guid="D195FADB-A3B0-4023-A824-8895552CDC56"?>

-        <?define cmf_krbv4w32_dll_name="krbv4w64.dll"?>

-        <?define cmf_leash32_exe_guid="D195FADB-A3B0-4023-A824-8895552CDC56"?>

-        <?define csc_leash32_exe_guid="9D43350A-A8AE-4405-AB82-64E90E5A1A70"?>

-        <?define rcm_leash_1_guid="7E5517FF-FB76-431f-A92B-2895C9BE7E98"?>

-        <?define rcm_leash_2_guid="008208AC-46BE-4ca4-BEA7-8FCAAD8BA7C3"?>

-        <?define rcm_leash_3_guid="008208AC-46BE-4ca4-BEA7-8FCAAD8BA7C3"?>

-        <?define rcm_leash_4_guid="D20180CC-B68D-4a6d-95E4-5EB07B9EADCD"?>

-        <?define rcm_leash_5_guid="AF3B73AE-86ED-42f5-987A-9831B8799D2F"?>

-        <?define rcm_leash_6_guid="0C72D4F8-096B-4295-8F0A-6B5723A8593D"?>

-        <?define csc_LeashStartup_guid="228192C5-D847-4c46-A726-0E8211742349"?>

-        <?define cmf_leash32_hlp_guid="228192C5-D847-4c46-A726-0E8211742349"?>

-        <?define cmf_leash32_chm_guid="769B54EB-9B96-4abe-9B72-9EF346C8C03D"?>

-        <?define cmf_leashw32_dll_guid="7222B9E1-EE70-4ccb-929F-43D45574AA83"?>

-        <?define cmf_leashw32_dll_name="leashw64.dll"?>

-        <?define rcm_leashdll_1_guid="64BC62DF-F1D6-423a-B4E0-E75E214BAC26"?>

-        <?define rcm_leashdll_2_guid="64BC62DF-F1D6-423a-B4E0-E75E214BAC26"?>

-        <?define rcm_leashdll_3_guid="64BC62DF-F1D6-423a-B4E0-E75E214BAC26"?>

-        <?define rcm_leashdll_4_guid="989B5FC5-63DC-47d6-BBBC-EE1B355127F6"?>

-        <?define rcm_leashdll_5_guid="989B5FC5-63DC-47d6-BBBC-EE1B355127F6"?>

-        <?define rcm_leashdll_6_guid="AC35CE64-9D8D-4a21-AB1F-18803C69E7B4"?>

-        <?define rcm_leashdll_7_guid="02014C27-BAC8-4b86-95F8-43F9BF55064A"?>

-        <?define rcm_leashdll_8_guid="DE70F57C-D3F8-4c1d-B868-A77DA04D9DD3"?>

-        <?define rcm_leashdll_9_guid="A809042D-66F3-4a6a-B8EC-77C40C88F3E3"?>

-        <?define rcm_leashdll_10_guid="E61875A4-F33C-419f-97B8-D2ACA3EBD4BB"?>

-        <?define rcm_leashdll_11_guid="3732992E-34C4-430a-B081-C8601BA44A61"?>

-        <?define rcm_leashdll_12_guid="2237072A-1955-4ca4-ABB3-78037E16F696"?>

-        <?define rcm_leashdll_13_guid="6F626DB7-B0A6-4c1d-889E-A2DA742DFC4B"?>

-        <?define rcm_leashdll_14_guid="109674B4-7390-49cc-9DB1-B9402E4C5645"?>

-        <?define rcm_leashdll_15_guid="8AC8500D-2279-4a3c-82E9-4C0ED79A6EFC"?>

-        <?define rcm_leashdll_16_guid="ED6BD7FE-7879-4da6-882D-98DEF6198F60"?>

-        <?define rcm_leashdll_17_guid="E5F8A4DF-442E-4d24-B5E2-9F36A4F7E15D"?>

-        <?define cmf_ms2mit_exe_guid="8AEC1FDA-4A45-4878-8C0B-465D46ACE306"?>

-        <?define cmf_mit2ms_exe_guid="3CE7BAE8-22DA-4911-B370-4C700861BDFD"?>

-        <?define cmf_wshelp32_dll_guid="24648FE7-D952-499c-8023-AFE4C7E52296"?>

-        <?define cmf_wshelp32_dll_name="wshelp64.dll"?>

-        <?define cmf_xpprof32_dll_guid="B1112677-50A4-4430-846B-F824C859E3DF"?>

-        <?define cmf_xpprof32_dll_name="xpprof64.dll"?>

-        <?define cmf_nidmgr32_dll_guid="8538212A-9BD5-4d62-BF29-36D853385F0A"?>

-        <?define cmf_nidmgr32_dll_name="nidmgr64.dll"?>

-        <?define cmf_nidmgr32_dll_w2k_guid="01655D48-C596-48f8-A0C3-5DB3FC833444"?>

-        <?define cmf_krb5cred_dll_guid="CC182AB1-E333-4501-8DEA-5A8D4FD36D0D"?>

-        <?define cmf_krb5cred_dll_name="krb5cred.dll"?>

-        <?define cmf_krb5cred_en_us_dll_guid="223B7E9D-290F-40b8-89B3-F8337A8E082D"?>

-        <?define cmf_krb5cred_en_us_dll_name="krb5cred_en_us.dll"?>

-        <?define cmf_krb4cred_dll_guid="AF3DB848-786B-4e0b-9D8F-F9074D0631F2"?>

-        <?define cmf_krb4cred_dll_name="krb4cred.dll"?>

-        <?define cmf_krb4cred_en_us_dll_guid="4D180CEF-59CD-4c39-872C-F84F58008107"?>

-        <?define cmf_krb4cred_en_us_dll_name="krb4cred_en_us.dll"?>

-        <?define cmf_netidmgr_exe_guid="487545C9-F145-4fb9-8610-5652A6C3FE48"?>

-        <?define cmf_netidmgr_exe_w2k_guid="F9D3A2A1-8BAE-41ff-BB50-2E6923D3368B"?>

-        <?define csc_NetIDMgrStartup_guid="7081976D-E9D5-424a-9564-917E0529E4D0"?>

-        <?define cmf_bin_debug_guid="F3432C85-89D9-4bd6-BD82-4ED49A118338"?>

-<?elseif $(var.Platform) = "Intel"?>

-        <?define UpgradeCode="61211594-AAA1-4A98-A299-757326763CC7"?>

-        <?define cmf_kfwlogon_DLL_guid="2F104FEB-2D61-458A-BAE3-B153F151E728"?>

-        <?define cmf_kfwcpcc_EXE_guid="C3284E7A-3665-45A6-B64E-C909B1D1BAA6"?>

-        <?define cmp_ClientSystemDebug_guid="2D13ED48-53C2-4878-B196-2AD7F4100998"?>

-        <?define rcm_krb4_1_guid="34262966-9196-49D6-86C9-AE98D3116DC0"?>

-        <?define rcm_krb4_2_guid="812334C6-EBDF-482C-8CB3-A6398AF9EDFC"?>                                        

-        <?define rcm_krb4_3_guid="5556ECD9-8721-41C2-846C-034C239B48F1"?>

-        <?define rcm_krb4_4_guid="61371A93-7F59-439D-A89C-070E100F465B"?>

-        <?define rcm_krb5_1_guid="E190F8B9-51FA-4FB1-884C-C8AFA37F8653"?>

-        <?define rcm_krb5_2_guid="AE7D4305-6193-4094-8C82-73862AE01DCE"?>

-        <?define rcm_krb5_3_guid="853EE035-99AA-489A-8FB6-74C76624E92A"?>

-        <?define cmf_comerr32_dll_guid="D8F455F9-E648-4C61-A69D-7116ADEC2DBB"?>

-        <?define cmf_comerr32_dll_name="comerr32.dll"?>

-        <?define cmf_gss_exe_guid="8CAF09C4-68A2-46DC-A618-AEF16D832E54"?>

-        <?define cmf_gss_client_exe_guid="983E0887-0C8B-49AB-8F59-DFE3A4E45E89"?>

-        <?define cmf_gss_server_exe_guid="B165FE41-D0DD-4DFC-92E6-A99ADA23BE8B"?>

-        <?define cmf_gssapi32_dll_guid="5B0F2989-BB85-40BF-BB7A-E77693972CF9"?>

-        <?define cmf_gssapi32_dll_name="gssapi32.dll"?>

-        <?define cmf_k524init_exe_guid="20BE4EA5-C465-4AF3-9A4F-BB80934167E3"?>

-        <?define cmf_kclnt32_dll_guid="D396C1E7-080E-49F5-92BA-73BCEDF09C8E"?>

-        <?define cmf_kclnt32_dll_name="kclnt32.dll"?>

-        <?define cmf_kdestroy_exe_guid="D1E9C111-7760-4EE6-86CF-D4B4064B0ABA"?>

-        <?define cmf_kcpytkt_exe_guid="6B20E57C-0033-4dcf-B3C9-74ED0B2CF46E"?>

-        <?define cmf_kdeltkt_exe_guid="C7528C87-9B61-439a-8EA8-AD4BE3D758F9"?>

-        <?define cmf_kinit_exe_guid="80643A09-EF28-4714-BC62-B64FC5B17CAA"?>

-        <?define cmf_klist_exe_guid="24FB6003-BC7A-4BF1-9503-82D398EC02D7"?>

-        <?define cmf_kpasswd_exe_guid="3FA4AB96-FF12-460A-814E-3380E220787C"?>

-        <?define cmf_kvno_exe_guid="7759D524-1F88-4483-975F-DDD33A511512"?>

-        <?define cmf_krb5_32_dll_guid="31E40356-CBAC-4FC6-9A34-C6F6C72A27CA"?>

-        <?define cmf_krb5_32_dll_name="krb5_32.dll"?>

-        <?define cmf_k5sprt32_dll_guid="F2381331-9201-4c02-866F-2038676771D4"?>

-        <?define cmf_k5sprt32_dll_name="k5sprt32.dll"?>

-        <?define cmf_krb524_dll_guid="98685874-A9AA-4BC5-9830-271D9CF52C17"?>

-        <?define cmf_krb524_dll_name="krb524.dll"?>

-        <?define cmf_krbcc32_dll_guid="A50FA27D-F203-4C19-9047-B7976171FB94"?>

-        <?define cmf_krbcc32_dll_name="krbcc32.dll"?>

-        <?define cmf_krbcc32s_exe_guid="7D5F0817-DACF-4B54-BB8D-94DD63626DB5"?>

-        <?define cmf_krbcc32s_exe_name="krbcc32s.exe"?>

-        <?define cmf_krbv4w32_dll_guid="DFA23F6C-5297-4876-AF52-6F7CF2CB34AC"?>

-        <?define cmf_krbv4w32_dll_name="krbv4w32.dll"?>

-        <?define cmf_leash32_exe_guid="990D5F6B-4CEE-4706-96F4-F7AF12F97DF7"?>

-        <?define csc_leash32_exe_guid="8A096700-47B1-4A0B-B7B5-44F75086DEAE"?>

-        <?define rcm_leash_1_guid="B91648A0-26F7-43BB-A954-202FF3811E3C"?>

-        <?define rcm_leash_2_guid="0D8DCC52-F855-4C46-86A1-198E6EE0CB8A"?>

-        <?define rcm_leash_3_guid="9610A7E3-251F-4286-B776-1C3AF5DE7815"?>

-        <?define rcm_leash_4_guid="815AED84-2437-4EBC-B561-F847833DB3A5"?>

-        <?define rcm_leash_5_guid="A0D3D75F-762E-4D5C-909B-53E7396CEDB6"?>

-        <?define rcm_leash_6_guid="F675C145-6F9D-4BC4-9DA0-CAFB47A96A71"?>

-        <?define csc_LeashStartup_guid="0DF73BCD-F34E-4B01-AA71-0EE08EB62F70"?>

-        <?define cmf_leash32_hlp_guid="919616D6-1605-4A79-8E33-C18A0D0F25E3"?>

-        <?define cmf_leash32_chm_guid="C50E5E0A-B822-4419-855B-1713637BCA6A"?>

-        <?define cmf_leashw32_dll_guid="8C145D48-A2FC-4C28-BC05-4368545F1184"?>

-        <?define cmf_leashw32_dll_name="leashw32.dll"?>

-        <?define rcm_leashdll_1_guid="54C949DA-AF1E-4412-81AF-F502BD5904D2"?>

-        <?define rcm_leashdll_2_guid="9B553794-45E7-49FB-B6D9-1C3C9BB6E00D"?>

-        <?define rcm_leashdll_3_guid="E3D1284C-17F6-41E3-9AA7-2ED05432060F"?>

-        <?define rcm_leashdll_4_guid="A02831D5-48B2-4E82-A670-EDCEBC197273"?>

-        <?define rcm_leashdll_5_guid="5FDB0C01-6668-43E3-9C83-2CD364D97BF3"?>

-        <?define rcm_leashdll_6_guid="999BD59C-5C1E-446E-9D38-F4E26DD27D09"?>

-        <?define rcm_leashdll_7_guid="C908AA17-DD21-4193-BA1D-535A2FD3D803"?>

-        <?define rcm_leashdll_8_guid="02926245-2327-46F9-AEF6-89E2DB0D90E1"?>

-        <?define rcm_leashdll_9_guid="B45BBA29-7A67-4FF7-AAA4-80044D46C451"?>

-        <?define rcm_leashdll_10_guid="1DDC4D78-BDB4-48CD-A4E9-024FA9706100"?>

-        <?define rcm_leashdll_11_guid="39134333-58C7-4C6B-B690-2322D3AE928A"?>

-        <?define rcm_leashdll_12_guid="BBB6F5C3-290F-4A21-A630-E8630C6EAB67"?>

-        <?define rcm_leashdll_13_guid="0F86A73E-DB31-45E7-9156-BE0EC99076A7"?>

-        <?define rcm_leashdll_14_guid="FE0F06A2-62E7-46C1-9BFF-337C50DB78C7"?>

-        <?define rcm_leashdll_15_guid="2DAC4693-6435-4278-A584-3D2B74BE87D5"?>

-        <?define rcm_leashdll_16_guid="FE3DDD47-CCDE-44F8-8C86-97F2C3545443"?>

-        <?define rcm_leashdll_17_guid="1B685E1B-32F2-49A5-9B7D-4288741A2C17"?>

-        <?define cmf_ms2mit_exe_guid="63D189DC-5EE4-49E2-B5E9-6E74A28602C8"?>

-        <?define cmf_mit2ms_exe_guid="4F487781-5B55-48c1-A3FA-8BC6ECA4FEA1"?>

-        <?define cmf_wshelp32_dll_guid="B9D9F5F1-CA93-4F56-B6F8-343F21484CDE"?>

-        <?define cmf_wshelp32_dll_name="wshelp32.dll"?>

-        <?define cmf_xpprof32_dll_guid="A7DF8BAF-7188-4C24-89FB-C8EB51571FD2"?>

-        <?define cmf_xpprof32_dll_name="xpprof32.dll"?>

-        <?define cmf_nidmgr32_dll_guid="EEBA3A0D-CE3D-42F1-8854-D7F63F597202"?>

-        <?define cmf_nidmgr32_dll_name="nidmgr32.dll"?>

-        <?define cmf_nidmgr32_dll_w2k_guid="33F42D7C-03CE-465F-9E0A-5F486FE64B04"?>

-        <?define cmf_krb5cred_dll_guid="27A7723A-F0D9-4F06-892C-54F0AC6014C3"?>

-        <?define cmf_krb5cred_dll_name="krb5cred.dll"?>

-        <?define cmf_krb5cred_en_us_dll_guid="EA9ABE05-A85B-43BB-8741-50D3C3128632"?>

-        <?define cmf_krb5cred_en_us_dll_name="krb5cred_en_us.dll"?>

-        <?define cmf_krb4cred_dll_guid="E3B86954-9D5D-4929-A5E6-B22ED03E6D6C"?>

-        <?define cmf_krb4cred_dll_name="krb4cred.dll"?>

-        <?define cmf_krb4cred_en_us_dll_guid="3FF40A29-E2C3-40F3-B81C-2948494BE4B0"?>

-        <?define cmf_krb4cred_en_us_dll_name="krb4cred_en_us.dll"?>

-        <?define cmf_netidmgr_exe_guid="AEB06D67-B4F3-45B1-AC1E-5C1AFF747756"?>

-        <?define cmf_netidmgr_exe_w2k_guid="0F85D4F3-7897-4FE3-8501-AD0C383CCB4F"?>

-        <?define csc_NetIDMgrStartup_guid="669227E3-0ADC-4173-90C3-631FCFC8EBC3"?>

-        <?define cmf_bin_debug_guid="C8468854-8261-4781-8119-A612636841E3"?>

-<?else?>

-        <?error Unknown platform?>

-<?endif?>

-</Include>

+<?xml version="1.0"?>
+<Include>
+<!-- Platform specific GUID's and other definitions -->
+<?if $(var.Platform) = "x64" ?>
+        <?define UpgradeCode="6DA9CD86-6028-4852-8C94-452CAC229244"?>
+        <?define cmf_kfwlogon_DLL_guid="CFC0B7C9-9A59-4022-89B3-25E0941D0369"?>
+        <?define cmf_kfwcpcc_EXE_guid="83F51B6D-F3C6-44cf-AC91-D1D6498FFA44"?>
+        <?define cmp_ClientSystemDebug_guid="7B25B1E0-A22A-43c7-BA97-C30FCA3B1230"?>
+        <?define rcm_krb4_1_guid="B3CF770A-2C0F-44c0-8F5B-7B808369D225"?>
+        <?define rcm_krb4_2_guid="0CF5732A-7659-4cf9-8D01-7E75E6DA2639"?>                                        
+        <?define rcm_krb4_3_guid="6A279F11-E441-49cb-80F0-3D807D7230DE"?>
+        <?define rcm_krb4_4_guid="CACB3731-C532-4d28-9E44-FFF35C1376D5"?>
+        <?define rcm_krb5_1_guid="21883AD6-1C00-4f1d-9922-477CF63CE6BF"?>
+        <?define rcm_krb5_2_guid="88CEA446-4617-46bc-916F-2AAA1E1EACF8"?>
+        <?define rcm_krb5_3_guid="28BFF4DB-D09E-4031-AB5D-232F6F707A45"?>
+        <?define cmf_comerr32_dll_guid="3C34EFDA-3F93-4aa6-AA44-718AA25DD346"?>
+        <?define cmf_comerr32_dll_name="comerr64.dll"?>
+        <?define cmf_gss_exe_guid="805EBB97-4860-40d4-A038-5E56717EAFB4"?>
+        <?define cmf_gss_client_exe_guid="5F192562-436C-4800-93C7-148F7D46F521"?>
+        <?define cmf_gss_server_exe_guid="33651319-01CB-4f2c-9B96-50F0F53E9CDF"?>
+        <?define cmf_gssapi32_dll_guid="ACD1D3FA-3E96-47a6-8A39-88BDA2EA3C9D"?>
+        <?define cmf_gssapi32_dll_name="gssapi64.dll"?>
+        <?define cmf_k524init_exe_guid="63630B70-D9B1-47bc-905D-E4DFA6F9D0D1"?>
+        <?define cmf_kclnt32_dll_guid="C26B3CAA-607C-42db-956C-9AA379CCE892"?>
+        <?define cmf_kclnt32_dll_name="kclnt64.dll"?>
+        <?define cmf_kdestroy_exe_guid="58AB2858-3513-4e4d-B76C-915B0D0DEE82"?>
+        <?define cmf_kcpytkt_exe_guid="B2BA9697-4E42-433d-BA85-79A49A622D84"?>
+        <?define cmf_kdeltkt_exe_guid="998BF60D-75EF-4807-BDA3-7DDE47C4F00F"?>
+        <?define cmf_kinit_exe_guid="6855B2B9-D3EB-42ce-B0EA-EFCD5960B635"?>
+        <?define cmf_klist_exe_guid="1AE98193-6596-4460-9B42-15C734E28CE8"?>
+        <?define cmf_kpasswd_exe_guid="669A2965-413F-4003-9F43-4615CC7C3B1A"?>
+        <?define cmf_kvno_exe_guid="56C95EBA-2A53-4567-AA44-9A0EE01BB390"?>
+        <?define cmf_krb5_32_dll_guid="8B7190D6-76BD-442b-893B-1EED4E26EC0A"?>
+        <?define cmf_krb5_32_dll_name="krb5_64.dll"?>
+        <?define cmf_k5sprt32_dll_guid="2DD8CE7D-8C8E-4cfb-BC73-765858DD1418"?>
+        <?define cmf_k5sprt32_dll_name="k5sprt64.dll"?>
+        <?define cmf_krb524_dll_guid="4FAFB2A6-FC42-466b-9A86-42C3150252E2"?>
+        <?define cmf_krb524_dll_name="krb524.dll"?>
+        <?define cmf_krbcc32_dll_guid="56DAD1B9-4A59-46e6-81CA-54E2B6C9D618"?>
+        <?define cmf_krbcc32_dll_name="krbcc64.dll"?>
+        <?define cmf_krbcc32s_exe_guid="0192F58B-9129-426d-A271-E18455EDC80E"?>
+        <?define cmf_krbcc32s_exe_name="krbcc64s.exe"?>
+        <?define cmf_krbv4w32_dll_guid="D195FADB-A3B0-4023-A824-8895552CDC56"?>
+        <?define cmf_krbv4w32_dll_name="krbv4w64.dll"?>
+        <?define cmf_leash32_exe_guid="D195FADB-A3B0-4023-A824-8895552CDC56"?>
+        <?define csc_leash32_exe_guid="9D43350A-A8AE-4405-AB82-64E90E5A1A70"?>
+        <?define rcm_leash_1_guid="7E5517FF-FB76-431f-A92B-2895C9BE7E98"?>
+        <?define rcm_leash_2_guid="008208AC-46BE-4ca4-BEA7-8FCAAD8BA7C3"?>
+        <?define rcm_leash_3_guid="008208AC-46BE-4ca4-BEA7-8FCAAD8BA7C3"?>
+        <?define rcm_leash_4_guid="D20180CC-B68D-4a6d-95E4-5EB07B9EADCD"?>
+        <?define rcm_leash_5_guid="AF3B73AE-86ED-42f5-987A-9831B8799D2F"?>
+        <?define rcm_leash_6_guid="0C72D4F8-096B-4295-8F0A-6B5723A8593D"?>
+        <?define csc_LeashStartup_guid="228192C5-D847-4c46-A726-0E8211742349"?>
+        <?define cmf_leash32_hlp_guid="228192C5-D847-4c46-A726-0E8211742349"?>
+        <?define cmf_leash32_chm_guid="769B54EB-9B96-4abe-9B72-9EF346C8C03D"?>
+        <?define cmf_leashw32_dll_guid="7222B9E1-EE70-4ccb-929F-43D45574AA83"?>
+        <?define cmf_leashw32_dll_name="leashw64.dll"?>
+        <?define rcm_leashdll_1_guid="64BC62DF-F1D6-423a-B4E0-E75E214BAC26"?>
+        <?define rcm_leashdll_2_guid="64BC62DF-F1D6-423a-B4E0-E75E214BAC26"?>
+        <?define rcm_leashdll_3_guid="64BC62DF-F1D6-423a-B4E0-E75E214BAC26"?>
+        <?define rcm_leashdll_4_guid="989B5FC5-63DC-47d6-BBBC-EE1B355127F6"?>
+        <?define rcm_leashdll_5_guid="989B5FC5-63DC-47d6-BBBC-EE1B355127F6"?>
+        <?define rcm_leashdll_6_guid="AC35CE64-9D8D-4a21-AB1F-18803C69E7B4"?>
+        <?define rcm_leashdll_7_guid="02014C27-BAC8-4b86-95F8-43F9BF55064A"?>
+        <?define rcm_leashdll_8_guid="DE70F57C-D3F8-4c1d-B868-A77DA04D9DD3"?>
+        <?define rcm_leashdll_9_guid="A809042D-66F3-4a6a-B8EC-77C40C88F3E3"?>
+        <?define rcm_leashdll_10_guid="E61875A4-F33C-419f-97B8-D2ACA3EBD4BB"?>
+        <?define rcm_leashdll_11_guid="3732992E-34C4-430a-B081-C8601BA44A61"?>
+        <?define rcm_leashdll_12_guid="2237072A-1955-4ca4-ABB3-78037E16F696"?>
+        <?define rcm_leashdll_13_guid="6F626DB7-B0A6-4c1d-889E-A2DA742DFC4B"?>
+        <?define rcm_leashdll_14_guid="109674B4-7390-49cc-9DB1-B9402E4C5645"?>
+        <?define rcm_leashdll_15_guid="8AC8500D-2279-4a3c-82E9-4C0ED79A6EFC"?>
+        <?define rcm_leashdll_16_guid="ED6BD7FE-7879-4da6-882D-98DEF6198F60"?>
+        <?define rcm_leashdll_17_guid="E5F8A4DF-442E-4d24-B5E2-9F36A4F7E15D"?>
+        <?define cmf_ms2mit_exe_guid="8AEC1FDA-4A45-4878-8C0B-465D46ACE306"?>
+        <?define cmf_mit2ms_exe_guid="3CE7BAE8-22DA-4911-B370-4C700861BDFD"?>
+        <?define cmf_wshelp32_dll_guid="24648FE7-D952-499c-8023-AFE4C7E52296"?>
+        <?define cmf_wshelp32_dll_name="wshelp64.dll"?>
+        <?define cmf_xpprof32_dll_guid="B1112677-50A4-4430-846B-F824C859E3DF"?>
+        <?define cmf_xpprof32_dll_name="xpprof64.dll"?>
+        <?define cmf_nidmgr32_dll_guid="8538212A-9BD5-4d62-BF29-36D853385F0A"?>
+        <?define cmf_nidmgr32_dll_name="nidmgr64.dll"?>
+        <?define cmf_nidmgr32_dll_w2k_guid="01655D48-C596-48f8-A0C3-5DB3FC833444"?>
+        <?define cmf_krb5cred_dll_guid="CC182AB1-E333-4501-8DEA-5A8D4FD36D0D"?>
+        <?define cmf_krb5cred_dll_name="krb5cred.dll"?>
+        <?define cmf_krb5cred_en_us_dll_guid="223B7E9D-290F-40b8-89B3-F8337A8E082D"?>
+        <?define cmf_krb5cred_en_us_dll_name="krb5cred_en_us.dll"?>
+        <?define cmf_krb4cred_dll_guid="AF3DB848-786B-4e0b-9D8F-F9074D0631F2"?>
+        <?define cmf_krb4cred_dll_name="krb4cred.dll"?>
+        <?define cmf_krb4cred_en_us_dll_guid="4D180CEF-59CD-4c39-872C-F84F58008107"?>
+        <?define cmf_krb4cred_en_us_dll_name="krb4cred_en_us.dll"?>
+        <?define cmf_netidmgr_exe_guid="487545C9-F145-4fb9-8610-5652A6C3FE48"?>
+        <?define cmf_netidmgr_exe_w2k_guid="F9D3A2A1-8BAE-41ff-BB50-2E6923D3368B"?>
+        <?define csc_NetIDMgrStartup_guid="7081976D-E9D5-424a-9564-917E0529E4D0"?>
+        <?define cmf_bin_debug_guid="F3432C85-89D9-4bd6-BD82-4ED49A118338"?>
+<?elseif $(var.Platform) = "Intel"?>
+        <?define UpgradeCode="61211594-AAA1-4A98-A299-757326763CC7"?>
+        <?define cmf_kfwlogon_DLL_guid="2F104FEB-2D61-458A-BAE3-B153F151E728"?>
+        <?define cmf_kfwcpcc_EXE_guid="C3284E7A-3665-45A6-B64E-C909B1D1BAA6"?>
+        <?define cmp_ClientSystemDebug_guid="2D13ED48-53C2-4878-B196-2AD7F4100998"?>
+        <?define rcm_krb4_1_guid="34262966-9196-49D6-86C9-AE98D3116DC0"?>
+        <?define rcm_krb4_2_guid="812334C6-EBDF-482C-8CB3-A6398AF9EDFC"?>                                        
+        <?define rcm_krb4_3_guid="5556ECD9-8721-41C2-846C-034C239B48F1"?>
+        <?define rcm_krb4_4_guid="61371A93-7F59-439D-A89C-070E100F465B"?>
+        <?define rcm_krb5_1_guid="E190F8B9-51FA-4FB1-884C-C8AFA37F8653"?>
+        <?define rcm_krb5_2_guid="AE7D4305-6193-4094-8C82-73862AE01DCE"?>
+        <?define rcm_krb5_3_guid="853EE035-99AA-489A-8FB6-74C76624E92A"?>
+        <?define cmf_comerr32_dll_guid="D8F455F9-E648-4C61-A69D-7116ADEC2DBB"?>
+        <?define cmf_comerr32_dll_name="comerr32.dll"?>
+        <?define cmf_gss_exe_guid="8CAF09C4-68A2-46DC-A618-AEF16D832E54"?>
+        <?define cmf_gss_client_exe_guid="983E0887-0C8B-49AB-8F59-DFE3A4E45E89"?>
+        <?define cmf_gss_server_exe_guid="B165FE41-D0DD-4DFC-92E6-A99ADA23BE8B"?>
+        <?define cmf_gssapi32_dll_guid="5B0F2989-BB85-40BF-BB7A-E77693972CF9"?>
+        <?define cmf_gssapi32_dll_name="gssapi32.dll"?>
+        <?define cmf_k524init_exe_guid="20BE4EA5-C465-4AF3-9A4F-BB80934167E3"?>
+        <?define cmf_kclnt32_dll_guid="D396C1E7-080E-49F5-92BA-73BCEDF09C8E"?>
+        <?define cmf_kclnt32_dll_name="kclnt32.dll"?>
+        <?define cmf_kdestroy_exe_guid="D1E9C111-7760-4EE6-86CF-D4B4064B0ABA"?>
+        <?define cmf_kcpytkt_exe_guid="6B20E57C-0033-4dcf-B3C9-74ED0B2CF46E"?>
+        <?define cmf_kdeltkt_exe_guid="C7528C87-9B61-439a-8EA8-AD4BE3D758F9"?>
+        <?define cmf_kinit_exe_guid="80643A09-EF28-4714-BC62-B64FC5B17CAA"?>
+        <?define cmf_klist_exe_guid="24FB6003-BC7A-4BF1-9503-82D398EC02D7"?>
+        <?define cmf_kpasswd_exe_guid="3FA4AB96-FF12-460A-814E-3380E220787C"?>
+        <?define cmf_kvno_exe_guid="7759D524-1F88-4483-975F-DDD33A511512"?>
+        <?define cmf_krb5_32_dll_guid="31E40356-CBAC-4FC6-9A34-C6F6C72A27CA"?>
+        <?define cmf_krb5_32_dll_name="krb5_32.dll"?>
+        <?define cmf_k5sprt32_dll_guid="F2381331-9201-4c02-866F-2038676771D4"?>
+        <?define cmf_k5sprt32_dll_name="k5sprt32.dll"?>
+        <?define cmf_krb524_dll_guid="98685874-A9AA-4BC5-9830-271D9CF52C17"?>
+        <?define cmf_krb524_dll_name="krb524.dll"?>
+        <?define cmf_krbcc32_dll_guid="A50FA27D-F203-4C19-9047-B7976171FB94"?>
+        <?define cmf_krbcc32_dll_name="krbcc32.dll"?>
+        <?define cmf_krbcc32s_exe_guid="7D5F0817-DACF-4B54-BB8D-94DD63626DB5"?>
+        <?define cmf_krbcc32s_exe_name="krbcc32s.exe"?>
+        <?define cmf_krbv4w32_dll_guid="DFA23F6C-5297-4876-AF52-6F7CF2CB34AC"?>
+        <?define cmf_krbv4w32_dll_name="krbv4w32.dll"?>
+        <?define cmf_leash32_exe_guid="990D5F6B-4CEE-4706-96F4-F7AF12F97DF7"?>
+        <?define csc_leash32_exe_guid="8A096700-47B1-4A0B-B7B5-44F75086DEAE"?>
+        <?define rcm_leash_1_guid="B91648A0-26F7-43BB-A954-202FF3811E3C"?>
+        <?define rcm_leash_2_guid="0D8DCC52-F855-4C46-86A1-198E6EE0CB8A"?>
+        <?define rcm_leash_3_guid="9610A7E3-251F-4286-B776-1C3AF5DE7815"?>
+        <?define rcm_leash_4_guid="815AED84-2437-4EBC-B561-F847833DB3A5"?>
+        <?define rcm_leash_5_guid="A0D3D75F-762E-4D5C-909B-53E7396CEDB6"?>
+        <?define rcm_leash_6_guid="F675C145-6F9D-4BC4-9DA0-CAFB47A96A71"?>
+        <?define csc_LeashStartup_guid="0DF73BCD-F34E-4B01-AA71-0EE08EB62F70"?>
+        <?define cmf_leash32_hlp_guid="919616D6-1605-4A79-8E33-C18A0D0F25E3"?>
+        <?define cmf_leash32_chm_guid="C50E5E0A-B822-4419-855B-1713637BCA6A"?>
+        <?define cmf_leashw32_dll_guid="8C145D48-A2FC-4C28-BC05-4368545F1184"?>
+        <?define cmf_leashw32_dll_name="leashw32.dll"?>
+        <?define rcm_leashdll_1_guid="54C949DA-AF1E-4412-81AF-F502BD5904D2"?>
+        <?define rcm_leashdll_2_guid="9B553794-45E7-49FB-B6D9-1C3C9BB6E00D"?>
+        <?define rcm_leashdll_3_guid="E3D1284C-17F6-41E3-9AA7-2ED05432060F"?>
+        <?define rcm_leashdll_4_guid="A02831D5-48B2-4E82-A670-EDCEBC197273"?>
+        <?define rcm_leashdll_5_guid="5FDB0C01-6668-43E3-9C83-2CD364D97BF3"?>
+        <?define rcm_leashdll_6_guid="999BD59C-5C1E-446E-9D38-F4E26DD27D09"?>
+        <?define rcm_leashdll_7_guid="C908AA17-DD21-4193-BA1D-535A2FD3D803"?>
+        <?define rcm_leashdll_8_guid="02926245-2327-46F9-AEF6-89E2DB0D90E1"?>
+        <?define rcm_leashdll_9_guid="B45BBA29-7A67-4FF7-AAA4-80044D46C451"?>
+        <?define rcm_leashdll_10_guid="1DDC4D78-BDB4-48CD-A4E9-024FA9706100"?>
+        <?define rcm_leashdll_11_guid="39134333-58C7-4C6B-B690-2322D3AE928A"?>
+        <?define rcm_leashdll_12_guid="BBB6F5C3-290F-4A21-A630-E8630C6EAB67"?>
+        <?define rcm_leashdll_13_guid="0F86A73E-DB31-45E7-9156-BE0EC99076A7"?>
+        <?define rcm_leashdll_14_guid="FE0F06A2-62E7-46C1-9BFF-337C50DB78C7"?>
+        <?define rcm_leashdll_15_guid="2DAC4693-6435-4278-A584-3D2B74BE87D5"?>
+        <?define rcm_leashdll_16_guid="FE3DDD47-CCDE-44F8-8C86-97F2C3545443"?>
+        <?define rcm_leashdll_17_guid="1B685E1B-32F2-49A5-9B7D-4288741A2C17"?>
+        <?define cmf_ms2mit_exe_guid="63D189DC-5EE4-49E2-B5E9-6E74A28602C8"?>
+        <?define cmf_mit2ms_exe_guid="4F487781-5B55-48c1-A3FA-8BC6ECA4FEA1"?>
+        <?define cmf_wshelp32_dll_guid="B9D9F5F1-CA93-4F56-B6F8-343F21484CDE"?>
+        <?define cmf_wshelp32_dll_name="wshelp32.dll"?>
+        <?define cmf_xpprof32_dll_guid="A7DF8BAF-7188-4C24-89FB-C8EB51571FD2"?>
+        <?define cmf_xpprof32_dll_name="xpprof32.dll"?>
+        <?define cmf_nidmgr32_dll_guid="EEBA3A0D-CE3D-42F1-8854-D7F63F597202"?>
+        <?define cmf_nidmgr32_dll_name="nidmgr32.dll"?>
+        <?define cmf_nidmgr32_dll_w2k_guid="33F42D7C-03CE-465F-9E0A-5F486FE64B04"?>
+        <?define cmf_krb5cred_dll_guid="27A7723A-F0D9-4F06-892C-54F0AC6014C3"?>
+        <?define cmf_krb5cred_dll_name="krb5cred.dll"?>
+        <?define cmf_krb5cred_en_us_dll_guid="EA9ABE05-A85B-43BB-8741-50D3C3128632"?>
+        <?define cmf_krb5cred_en_us_dll_name="krb5cred_en_us.dll"?>
+        <?define cmf_krb4cred_dll_guid="E3B86954-9D5D-4929-A5E6-B22ED03E6D6C"?>
+        <?define cmf_krb4cred_dll_name="krb4cred.dll"?>
+        <?define cmf_krb4cred_en_us_dll_guid="3FF40A29-E2C3-40F3-B81C-2948494BE4B0"?>
+        <?define cmf_krb4cred_en_us_dll_name="krb4cred_en_us.dll"?>
+        <?define cmf_netidmgr_exe_guid="AEB06D67-B4F3-45B1-AC1E-5C1AFF747756"?>
+        <?define cmf_netidmgr_exe_w2k_guid="0F85D4F3-7897-4FE3-8501-AD0C383CCB4F"?>
+        <?define csc_NetIDMgrStartup_guid="669227E3-0ADC-4173-90C3-631FCFC8EBC3"?>
+        <?define cmf_bin_debug_guid="C8468854-8261-4781-8119-A612636841E3"?>
+<?else?>
+        <?error Unknown platform?>
+<?endif?>
+</Include>
diff --git a/src/windows/installer/wix/runtime.wxi b/src/windows/installer/wix/runtime.wxi
index 13d491b854..7b09fea2cd 100644
--- a/src/windows/installer/wix/runtime.wxi
+++ b/src/windows/installer/wix/runtime.wxi
@@ -1,90 +1,90 @@
-<?xml version="1.0"?> 

-<Include>

-    <?ifdef CL1400 ?>

-		<MergeRef Id="MSVCRT8MEM"/>

-		<MergeRef Id="MSVCRT8POL"/>

-		<MergeRef Id="MSVCRT8MFC"/>

-		<MergeRef Id="MSVCRT8PFC"/>

-		<MergeRef Id="MSVCRT8MFL"/>

-		<MergeRef Id="MSVCRT8PFL"/>

-    <?endif?>

-<?ifndef Debug?>

-    <?ifdef CL1310 ?>

-        <?ifdef comment?>

-        <MergeRef Id="mergeVC1310LibMFC" />

-        <MergeRef Id="mergeVC1310LibCRT" />

-        <?else?>

-            <ComponentRef Id="cmf_mfc71_dll" />

-            <ComponentRef Id="cmf_msvcr71_dll" />

-            <ComponentRef Id="cmf_msvcp71_dll" />

-            <ComponentRef Id="cmf_mfc71chs_dll" />

-            <ComponentRef Id="cmf_mfc71cht_dll" />

-            <ComponentRef Id="cmf_mfc71deu_dll" />

-            <ComponentRef Id="cmf_mfc71enu_dll" />

-            <ComponentRef Id="cmf_mfc71esp_dll" />

-            <ComponentRef Id="cmf_mfc71fra_dll" />

-            <ComponentRef Id="cmf_mfc71ita_dll" />

-            <ComponentRef Id="cmf_mfc71jpn_dll" />

-            <ComponentRef Id="cmf_mfc71kor_dll" />

-        <?endif?>

-    <?endif?>

-    <?ifdef CL1300 ?>

-        <?ifdef comment?>

-        <MergeRef Id="mergeVC1300LibMFC" />

-        <MergeRef Id="mergeVC1300LibCRT" />

-        <?else?>

-            <ComponentRef Id="cmf_mfc70_dll" />

-            <ComponentRef Id="cmf_msvcr70_dll" />

-            <ComponentRef Id="cmf_msvcp70_dll" />

-            <ComponentRef Id="cmf_mfc70chs_dll" />

-            <ComponentRef Id="cmf_mfc70cht_dll" />

-            <ComponentRef Id="cmf_mfc70deu_dll" />

-            <ComponentRef Id="cmf_mfc70enu_dll" />

-            <ComponentRef Id="cmf_mfc70esp_dll" />

-            <ComponentRef Id="cmf_mfc70fra_dll" />

-            <ComponentRef Id="cmf_mfc70ita_dll" />

-            <ComponentRef Id="cmf_mfc70jpn_dll" />

-            <ComponentRef Id="cmf_mfc70kor_dll" />

-        <?endif?>

-    <?endif?>

-    <?ifdef CL1200 ?>

-        <ComponentRef Id="cmf_mfc42_dll" />

-        <ComponentRef Id="cmf_msvcp60_dll" />

-        <ComponentRef Id="cmf_msvcrt_dll" />

-    <?endif?>

-<?else?>

-    <?ifdef CL1310 ?>

-        <ComponentRef Id="cmf_mfc71d_dll" />

-        <ComponentRef Id="cmf_msvcr71d_dll" />

-        <ComponentRef Id="cmf_msvcp71d_dll" />

-        <ComponentRef Id="cmf_mfc71chs_dll" />

-        <ComponentRef Id="cmf_mfc71cht_dll" />

-        <ComponentRef Id="cmf_mfc71deu_dll" />

-        <ComponentRef Id="cmf_mfc71enu_dll" />

-        <ComponentRef Id="cmf_mfc71esp_dll" />

-        <ComponentRef Id="cmf_mfc71fra_dll" />

-        <ComponentRef Id="cmf_mfc71ita_dll" />

-        <ComponentRef Id="cmf_mfc71jpn_dll" />

-        <ComponentRef Id="cmf_mfc71kor_dll" />

-    <?endif?>

-    <?ifdef CL1300 ?>

-        <ComponentRef Id="cmf_mfc70d_dll" />

-        <ComponentRef Id="cmf_msvcr70d_dll" />

-        <ComponentRef Id="cmf_msvcp70d_dll" />

-        <ComponentRef Id="cmf_mfc70chs_dll" />

-        <ComponentRef Id="cmf_mfc70cht_dll" />

-        <ComponentRef Id="cmf_mfc70deu_dll" />

-        <ComponentRef Id="cmf_mfc70enu_dll" />

-        <ComponentRef Id="cmf_mfc70esp_dll" />

-        <ComponentRef Id="cmf_mfc70fra_dll" />

-        <ComponentRef Id="cmf_mfc70ita_dll" />

-        <ComponentRef Id="cmf_mfc70jpn_dll" />

-        <ComponentRef Id="cmf_mfc70kor_dll" />

-    <?endif?>

-    <?ifdef CL1200 ?>

-        <ComponentRef Id="cmf_mfc42d_dll" />

-        <ComponentRef Id="cmf_msvcp60d_dll" />

-        <ComponentRef Id="cmf_msvcrtd_dll" />

-    <?endif?>

-<?endif?>

+<?xml version="1.0"?> 
+<Include>
+    <?ifdef CL1400 ?>
+		<MergeRef Id="MSVCRT8MEM"/>
+		<MergeRef Id="MSVCRT8POL"/>
+		<MergeRef Id="MSVCRT8MFC"/>
+		<MergeRef Id="MSVCRT8PFC"/>
+		<MergeRef Id="MSVCRT8MFL"/>
+		<MergeRef Id="MSVCRT8PFL"/>
+    <?endif?>
+<?ifndef Debug?>
+    <?ifdef CL1310 ?>
+        <?ifdef comment?>
+        <MergeRef Id="mergeVC1310LibMFC" />
+        <MergeRef Id="mergeVC1310LibCRT" />
+        <?else?>
+            <ComponentRef Id="cmf_mfc71_dll" />
+            <ComponentRef Id="cmf_msvcr71_dll" />
+            <ComponentRef Id="cmf_msvcp71_dll" />
+            <ComponentRef Id="cmf_mfc71chs_dll" />
+            <ComponentRef Id="cmf_mfc71cht_dll" />
+            <ComponentRef Id="cmf_mfc71deu_dll" />
+            <ComponentRef Id="cmf_mfc71enu_dll" />
+            <ComponentRef Id="cmf_mfc71esp_dll" />
+            <ComponentRef Id="cmf_mfc71fra_dll" />
+            <ComponentRef Id="cmf_mfc71ita_dll" />
+            <ComponentRef Id="cmf_mfc71jpn_dll" />
+            <ComponentRef Id="cmf_mfc71kor_dll" />
+        <?endif?>
+    <?endif?>
+    <?ifdef CL1300 ?>
+        <?ifdef comment?>
+        <MergeRef Id="mergeVC1300LibMFC" />
+        <MergeRef Id="mergeVC1300LibCRT" />
+        <?else?>
+            <ComponentRef Id="cmf_mfc70_dll" />
+            <ComponentRef Id="cmf_msvcr70_dll" />
+            <ComponentRef Id="cmf_msvcp70_dll" />
+            <ComponentRef Id="cmf_mfc70chs_dll" />
+            <ComponentRef Id="cmf_mfc70cht_dll" />
+            <ComponentRef Id="cmf_mfc70deu_dll" />
+            <ComponentRef Id="cmf_mfc70enu_dll" />
+            <ComponentRef Id="cmf_mfc70esp_dll" />
+            <ComponentRef Id="cmf_mfc70fra_dll" />
+            <ComponentRef Id="cmf_mfc70ita_dll" />
+            <ComponentRef Id="cmf_mfc70jpn_dll" />
+            <ComponentRef Id="cmf_mfc70kor_dll" />
+        <?endif?>
+    <?endif?>
+    <?ifdef CL1200 ?>
+        <ComponentRef Id="cmf_mfc42_dll" />
+        <ComponentRef Id="cmf_msvcp60_dll" />
+        <ComponentRef Id="cmf_msvcrt_dll" />
+    <?endif?>
+<?else?>
+    <?ifdef CL1310 ?>
+        <ComponentRef Id="cmf_mfc71d_dll" />
+        <ComponentRef Id="cmf_msvcr71d_dll" />
+        <ComponentRef Id="cmf_msvcp71d_dll" />
+        <ComponentRef Id="cmf_mfc71chs_dll" />
+        <ComponentRef Id="cmf_mfc71cht_dll" />
+        <ComponentRef Id="cmf_mfc71deu_dll" />
+        <ComponentRef Id="cmf_mfc71enu_dll" />
+        <ComponentRef Id="cmf_mfc71esp_dll" />
+        <ComponentRef Id="cmf_mfc71fra_dll" />
+        <ComponentRef Id="cmf_mfc71ita_dll" />
+        <ComponentRef Id="cmf_mfc71jpn_dll" />
+        <ComponentRef Id="cmf_mfc71kor_dll" />
+    <?endif?>
+    <?ifdef CL1300 ?>
+        <ComponentRef Id="cmf_mfc70d_dll" />
+        <ComponentRef Id="cmf_msvcr70d_dll" />
+        <ComponentRef Id="cmf_msvcp70d_dll" />
+        <ComponentRef Id="cmf_mfc70chs_dll" />
+        <ComponentRef Id="cmf_mfc70cht_dll" />
+        <ComponentRef Id="cmf_mfc70deu_dll" />
+        <ComponentRef Id="cmf_mfc70enu_dll" />
+        <ComponentRef Id="cmf_mfc70esp_dll" />
+        <ComponentRef Id="cmf_mfc70fra_dll" />
+        <ComponentRef Id="cmf_mfc70ita_dll" />
+        <ComponentRef Id="cmf_mfc70jpn_dll" />
+        <ComponentRef Id="cmf_mfc70kor_dll" />
+    <?endif?>
+    <?ifdef CL1200 ?>
+        <ComponentRef Id="cmf_mfc42d_dll" />
+        <ComponentRef Id="cmf_msvcp60d_dll" />
+        <ComponentRef Id="cmf_msvcrtd_dll" />
+    <?endif?>
+<?endif?>
 </Include>
\ No newline at end of file
diff --git a/src/windows/installer/wix/runtime_debug.wxi b/src/windows/installer/wix/runtime_debug.wxi
index f30786bc31..30bc566e9f 100644
--- a/src/windows/installer/wix/runtime_debug.wxi
+++ b/src/windows/installer/wix/runtime_debug.wxi
@@ -1,14 +1,14 @@
-<?xml version="1.0"?>

-<Include>

-  <?ifdef Debug?>

-    <?ifdef CL1310 ?>

-        <ComponentRef Id="cmf_runtime_debug1310" />

-    <?endif?>

-    <?ifdef CL1300 ?>

-        <ComponentRef Id="cmf_runtime_debug1300" />

-    <?endif?>

-    <?ifdef CL1200 ?>

-        <ComponentRef Id="cmf_runtime_debug1200" />

-    <?endif?>

-  <?endif?>

-</Include>

+<?xml version="1.0"?>
+<Include>
+  <?ifdef Debug?>
+    <?ifdef CL1310 ?>
+        <ComponentRef Id="cmf_runtime_debug1310" />
+    <?endif?>
+    <?ifdef CL1300 ?>
+        <ComponentRef Id="cmf_runtime_debug1300" />
+    <?endif?>
+    <?ifdef CL1200 ?>
+        <ComponentRef Id="cmf_runtime_debug1200" />
+    <?endif?>
+  <?endif?>
+</Include>
diff --git a/src/windows/installer/wix/site-local-tagged.wxi b/src/windows/installer/wix/site-local-tagged.wxi
index 2b48e5045d..c9a5651128 100644
--- a/src/windows/installer/wix/site-local-tagged.wxi
+++ b/src/windows/installer/wix/site-local-tagged.wxi
@@ -1,105 +1,105 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Include xmlns="http://schemas.microsoft.com/wix/2003/01/wi">

-

-    <!-- User configurable options -->

-

-	<!-- Items enclosed in double percent marks will be substituted by 

-	    the build script. -->

-    

-    <!-- TargetDir should point to build target directory and must end with 

-         a backslash.  If not specified, assume we are in TargetDir\install -->

-

-    <?define TargetDir="%TARGETDIR%\"?>

-

-    <!-- ConfigDir should point to directory containing configuration files 

-         (krb5.ini, krb.con, krbrealm.con) to be bundled with the installer.

-         The directory name should end with a backslash. -->

-

-    <?define ConfigDir="%CONFIGDIR-WIX%\"?>

-    

-    <!-- VersionMajor, VersionMinor and VersionPatch must all be specified, or 

-         none should be specified (in which case, the defaults will be

-         selected below. -->

-

-    <!-- version defs go here -->

-        <?define VersionMajor="%VERSION_MAJOR%"?>

-        <?define VersionMinor="%VERSION_MINOR%"?>

-        <?define VersionPatch="%VERSION_PATCH%"?>

-

-    <!-- BuildLang is the language code for the installation.  If you are

-         changing this, you should also change the ProductCode below. -->  

-    <?ifndef BuildLang?>

-        <?define BuildLang="1033"?>

-    <?endif?>

-

-    <!-- ProductCode is an uppercase GUID.  Each release should have its

-         own ProductCode.  If one is not defined, we generate a random one. -->

-    <?ifndef ProductCode?>

-	    <?define ProductCode="????????-????-????-????-????????????"?>    

-    <?endif?>

-    

-    <!-- DefaultRealm, is your default realm.  Must be uppercase -->

-    <?define DefaultRealm="ATHENA.MIT.EDU"?>

-    

-    <!-- One of the following must be defined and must correspond to the

-         version of compiler used for building Kerberos for Windows -->

-

-    <!-- <?define CL1200?> -->

-    <!-- <?define CL1300?> -->

-    <?define CL1310?>

-    <!-- <?define CL1400?> -->

-

-    <!-- At most one of the following could be defined and must correspond

-         to the type of build performed. -->

-    <!-- <?define Debug?> -->

-    <?define Release?>

-

-    <!-- We are including debug symbols anyway.  Undefine this for a leaner 

-         installer without debug syms. -->

-    <?define DebugSyms?>

-

-    <!-- Optional defines -->

-    <?define Beta="1"?> <!-- Numeric Beta identifier -->

-    <!-- <?define OldHelp?> --> <!-- Specifies the use of the old leash32.hlp file 

-                           instead of the new leash32.chm file -->

-

-

-    <!-- End of user configurable options -->

-    

-    <!-- Assert that required options are defined, or select defaults if

-         they weren't -->

-

-    <?ifndef TargetDir?>

-        <?define TargetDir="$(sys.SOURCEFILEDIR)..\"?>

-    <?endif?>

-    

-    <?ifndef ConfigDir?>

-        <?define ConfigDir="$(env.SystemRoot)\"?>

-    <?endif?>

-

-    <?ifndef VersionMajor?>

-        <?define VersionMajor="3"?>

-        <?define VersionMinor="2"?>

-        <?define VersionPatch="0"?>

-    <?else?>

-        <?if Not ($(var.VersionMinor) And $(var.VersionPatch))?>

-            <?error VersionMajor, VersionMinor and VersionPatch should be specified together?>

-        <?endif?>

-    <?endif?>

-    

-    <?ifndef ProductCode?>

-        <?error Must define ProductCode?>

-    <?endif?>

-    

-    <?ifndef BuildLang?>

-        <?error Must define BuildLang?>

-    <?endif?>

-

-    <!-- DefaultRealm.  Must be uppercase. -->

-    <?ifndef DefaultRealm?>

-        <?error Must define DefaultRealm?>

-    <?endif?>

-    

-    <!-- The build makefile defines 'Date' and 'Time' which are strings that 

-         identify the time at which the build was performed. -->

+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
+
+    <!-- User configurable options -->
+
+	<!-- Items enclosed in double percent marks will be substituted by 
+	    the build script. -->
+    
+    <!-- TargetDir should point to build target directory and must end with 
+         a backslash.  If not specified, assume we are in TargetDir\install -->
+
+    <?define TargetDir="%TARGETDIR%\"?>
+
+    <!-- ConfigDir should point to directory containing configuration files 
+         (krb5.ini, krb.con, krbrealm.con) to be bundled with the installer.
+         The directory name should end with a backslash. -->
+
+    <?define ConfigDir="%CONFIGDIR-WIX%\"?>
+    
+    <!-- VersionMajor, VersionMinor and VersionPatch must all be specified, or 
+         none should be specified (in which case, the defaults will be
+         selected below. -->
+
+    <!-- version defs go here -->
+        <?define VersionMajor="%VERSION_MAJOR%"?>
+        <?define VersionMinor="%VERSION_MINOR%"?>
+        <?define VersionPatch="%VERSION_PATCH%"?>
+
+    <!-- BuildLang is the language code for the installation.  If you are
+         changing this, you should also change the ProductCode below. -->  
+    <?ifndef BuildLang?>
+        <?define BuildLang="1033"?>
+    <?endif?>
+
+    <!-- ProductCode is an uppercase GUID.  Each release should have its
+         own ProductCode.  If one is not defined, we generate a random one. -->
+    <?ifndef ProductCode?>
+	    <?define ProductCode="????????-????-????-????-????????????"?>    
+    <?endif?>
+    
+    <!-- DefaultRealm, is your default realm.  Must be uppercase -->
+    <?define DefaultRealm="ATHENA.MIT.EDU"?>
+    
+    <!-- One of the following must be defined and must correspond to the
+         version of compiler used for building Kerberos for Windows -->
+
+    <!-- <?define CL1200?> -->
+    <!-- <?define CL1300?> -->
+    <?define CL1310?>
+    <!-- <?define CL1400?> -->
+
+    <!-- At most one of the following could be defined and must correspond
+         to the type of build performed. -->
+    <!-- <?define Debug?> -->
+    <?define Release?>
+
+    <!-- We are including debug symbols anyway.  Undefine this for a leaner 
+         installer without debug syms. -->
+    <?define DebugSyms?>
+
+    <!-- Optional defines -->
+    <?define Beta="1"?> <!-- Numeric Beta identifier -->
+    <!-- <?define OldHelp?> --> <!-- Specifies the use of the old leash32.hlp file 
+                           instead of the new leash32.chm file -->
+
+
+    <!-- End of user configurable options -->
+    
+    <!-- Assert that required options are defined, or select defaults if
+         they weren't -->
+
+    <?ifndef TargetDir?>
+        <?define TargetDir="$(sys.SOURCEFILEDIR)..\"?>
+    <?endif?>
+    
+    <?ifndef ConfigDir?>
+        <?define ConfigDir="$(env.SystemRoot)\"?>
+    <?endif?>
+
+    <?ifndef VersionMajor?>
+        <?define VersionMajor="3"?>
+        <?define VersionMinor="2"?>
+        <?define VersionPatch="0"?>
+    <?else?>
+        <?if Not ($(var.VersionMinor) And $(var.VersionPatch))?>
+            <?error VersionMajor, VersionMinor and VersionPatch should be specified together?>
+        <?endif?>
+    <?endif?>
+    
+    <?ifndef ProductCode?>
+        <?error Must define ProductCode?>
+    <?endif?>
+    
+    <?ifndef BuildLang?>
+        <?error Must define BuildLang?>
+    <?endif?>
+
+    <!-- DefaultRealm.  Must be uppercase. -->
+    <?ifndef DefaultRealm?>
+        <?error Must define DefaultRealm?>
+    <?endif?>
+    
+    <!-- The build makefile defines 'Date' and 'Time' which are strings that 
+         identify the time at which the build was performed. -->
 </Include>
\ No newline at end of file