From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 19 Sep 2008 15:24:28 +0000 (+0000)
Subject: Merged revisions 66514 via svnmerge from
X-Git-Tag: v3.0rc2~177
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df014bf604406e4ee75869f285a17443bcae0650;p=thirdparty%2FPython%2Fcpython.git

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

........
  r66514 | martin.v.loewis | 2008-09-19 17:21:07 +0200 (Fr, 19 Sep 2008) | 2 lines

  Bug #3887: Package x64 version of CRT for AMD64
  Windows binaries.
........
---

diff --git a/Tools/msi/merge.py b/Tools/msi/merge.py
index 412356765da6..3202f98b2abd 100644
--- a/Tools/msi/merge.py
+++ b/Tools/msi/merge.py
@@ -9,7 +9,7 @@ msi = None
 if len(sys.argv)==2:
     msi = sys.argv[1]
 if Win64:
-    modules = ["Microsoft_VC90_CRT_x86.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"]
+    modules = ["Microsoft_VC90_CRT_x86_x64.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"]
     if not msi: msi = "python-%s.amd64.msi" % full_current_version
 else:
     modules = ["Microsoft_VC90_CRT_x86.msm","policy_8_0_Microsoft_VC80_CRT_x86.msm"]