merge #11696

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

Sun, 27 Mar 2011 19:07:13 +0000 (21:07 +0200)

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

Sun, 27 Mar 2011 19:07:13 +0000 (21:07 +0200)
author Martin v. Löwis <martin@v.loewis.de>
Sun, 27 Mar 2011 19:07:13 +0000 (21:07 +0200)
committer Martin v. Löwis <martin@v.loewis.de>
Sun, 27 Mar 2011 19:07:13 +0000 (21:07 +0200)
diff --cc Lib/msilib/__init__.py
Simple merge
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Martin v. Löwis <martin@v.loewis.de>
	Sun, 27 Mar 2011 19:07:13 +0000 (21:07 +0200)
committer	Martin v. Löwis <martin@v.loewis.de>
	Sun, 27 Mar 2011 19:07:13 +0000 (21:07 +0200)
		1	2
Lib/msilib/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history