commit b29f2d710189c1eff01d50e5b9adaa663a0d96ee
author Martin v. Löwis <martin@v.loewis.de> Sun Sep 14 20:27:52 2008 +0000
committer Martin v. Löwis <martin@v.loewis.de> Sun Sep 14 20:27:52 2008 +0000
tree 66125446454c890e57b3f7aa1a633ac835a5ae3e
parent 3a2fb1444ac8d8fefe0d83f4f2d680e64d21a2e2

Merged revisions 66460-66461 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66460 | martin.v.loewis | 2008-09-14 22:22:39 +0200 (So, 14 Sep 2008) | 1 line

  Issue #3617: Include a licensing statement regarding the Microsoft C runtime in the Windows installer.
........
  r66461 | martin.v.loewis | 2008-09-14 22:25:40 +0200 (So, 14 Sep 2008) | 1 line

  Set eol-style to native.
........

Tools/msi/msi.py

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 0557bd3..8a8189e 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -862,6 +862,7 @@
     import shutil, glob
     out = open("LICENSE.txt", "w")
     shutil.copyfileobj(open(os.path.join(srcdir, "LICENSE")), out)
+    shutil.copyfileobj(open("crtlicense.txt"), out)
     for name, pat, file in (("bzip2","bzip2-*", "LICENSE"),
                       ("Berkeley DB", "db-*", "LICENSE"),
                       ("openssl", "openssl-*", "LICENSE"),