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

........
  r62246 | georg.brandl | 2008-04-09 19:57:38 +0200 (Mi, 09 Apr 2008) | 2 lines

  #2585: initialize code attribute of HTTPError.
........
  r62247 | georg.brandl | 2008-04-09 19:58:56 +0200 (Mi, 09 Apr 2008) | 2 lines

  Add :issue: directive for easy linking to bugs.python.org.
........
  r62249 | gregory.p.smith | 2008-04-09 20:18:43 +0200 (Mi, 09 Apr 2008) | 2 lines

  Add a note about the zlib.decompressobj().flush() fix.
........
  r62255 | martin.v.loewis | 2008-04-09 20:56:20 +0200 (Mi, 09 Apr 2008) | 2 lines

  Package wininst*.exe from distutils/command.
........
  r62259 | andrew.kuchling | 2008-04-10 00:28:43 +0200 (Do, 10 Apr 2008) | 1 line

  Try out the new issue role.  Thanks, Georg!
........
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 978e7f7..d2774c8 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -969,10 +969,7 @@
             lib.glob("*.gif")
             lib.add_file("idle.icns")
         if dir=="command" and parent.physical=="distutils":
-            lib.add_file("wininst-6.0.exe")
-            lib.add_file("wininst-7.1.exe")
-            lib.add_file("wininst-8.0.exe")
-            lib.add_file("wininst-9.0.exe")
+            lib.glob("wininst*.exe")
         if dir=="setuptools":
             lib.add_file("cli.exe")
             lib.add_file("gui.exe")