Merged fix for #15803 from 3.2 through 3.3

author Łukasz Langa <lukasz@langa.pl>

Mon, 31 Dec 2012 01:26:11 +0000 (02:26 +0100)

committer Łukasz Langa <lukasz@langa.pl>

Mon, 31 Dec 2012 01:26:11 +0000 (02:26 +0100)
author Łukasz Langa <lukasz@langa.pl>
Mon, 31 Dec 2012 01:26:11 +0000 (02:26 +0100)
committer Łukasz Langa <lukasz@langa.pl>
Mon, 31 Dec 2012 01:26:11 +0000 (02:26 +0100)
diff --cc Lib/configparser.py
Simple merge
diff --cc Misc/ACKS
Simple merge
author	Łukasz Langa <lukasz@langa.pl>
	Mon, 31 Dec 2012 01:26:11 +0000 (02:26 +0100)
committer	Łukasz Langa <lukasz@langa.pl>
	Mon, 31 Dec 2012 01:26:11 +0000 (02:26 +0100)
		1	2
Lib/configparser.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history