merge #7639

author Martin v. Löwis <martin@v.loewis.de>

Sun, 27 Mar 2011 08:14:57 +0000 (10:14 +0200)

committer Martin v. Löwis <martin@v.loewis.de>

Sun, 27 Mar 2011 08:14:57 +0000 (10:14 +0200)
author Martin v. Löwis <martin@v.loewis.de>
Sun, 27 Mar 2011 08:14:57 +0000 (10:14 +0200)
committer Martin v. Löwis <martin@v.loewis.de>
Sun, 27 Mar 2011 08:14:57 +0000 (10:14 +0200)
diff --cc Lib/msilib/__init__.py
Simple merge
diff --cc Misc/NEWS

index ec8f7fe4df18d0dcfa4dea82ea4f877d0b464370,0ae694626cfbd9268fa9ddb4d3fe0c7de29e51f7..7a84a6f05a4dfa68484e2c459befb44d50ec99cc
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -53,6 -48,8 +53,8 @@@ Core and Builtin
   Library
   -------
   
- -- Issue #7639: Fix short file name generation in bdist_msi.
++- Issue #7639: Fix short file name generation in bdist_msi
+ 
   - Issue #11659: Fix ResourceWarning in test_subprocess introduced by #11459.
     Patch by Ben Hayden.
author	Martin v. Löwis <martin@v.loewis.de>
	Sun, 27 Mar 2011 08:14:57 +0000 (10:14 +0200)
committer	Martin v. Löwis <martin@v.loewis.de>
	Sun, 27 Mar 2011 08:14:57 +0000 (10:14 +0200)
		1	2
Lib/msilib/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history