merge:Do not add txt files twice

diff --cc Tools/msi/msi.py
index 5db62cdd24691230f4c0f76b29be7061d5095008,b668c7aaec9bdceebac46a11ac9d86d8e433e211..53e652d57fd63ff9676f3fac81eeb2d6fb9a0e99
--- 1/Tools/msi/msi.py
--- 2/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@@ -1024,24 -1018,13 +1024,22 @@@ def add_files(db)
              lib.glob("*.uue")
              lib.glob("*.pem")
              lib.glob("*.pck")
 +            lib.glob("cfgparser.*")
 +            lib.add_file("zip_cp437_header.zip")
              lib.add_file("zipdir.zip")
 +        if dir=='capath':
 +            lib.glob("*.0")
          if dir=='tests' and parent.physical=='distutils':
              lib.add_file("Setup.sample")
-         if dir=='cjkencodings':
-             lib.glob("*.txt")
          if dir=='decimaltestdata':
              lib.glob("*.decTest")
 +        if dir=='xmltestdata':
 +            lib.glob("*.xml")
 +            lib.add_file("test.xml.out")
          if dir=='output':
              lib.glob("test_*")
 +        if dir=='sndhdrdata':
 +            lib.glob("sndhdr.*")
          if dir=='idlelib':
              lib.glob("*.def")
              lib.add_file("idle.bat")