Merged solution for #11324 from 3.2.

author Łukasz Langa <lukasz@langa.pl>

Thu, 28 Apr 2011 15:04:25 +0000 (17:04 +0200)

committer Łukasz Langa <lukasz@langa.pl>

Thu, 28 Apr 2011 15:04:25 +0000 (17:04 +0200)
author Łukasz Langa <lukasz@langa.pl>
Thu, 28 Apr 2011 15:04:25 +0000 (17:04 +0200)
committer Łukasz Langa <lukasz@langa.pl>
Thu, 28 Apr 2011 15:04:25 +0000 (17:04 +0200)
diff --cc Lib/configparser.py
Simple merge
diff --cc Lib/test/test_configparser.py
Simple merge
diff --cc Misc/ACKS
Simple merge
author	Łukasz Langa <lukasz@langa.pl>
	Thu, 28 Apr 2011 15:04:25 +0000 (17:04 +0200)
committer	Łukasz Langa <lukasz@langa.pl>
	Thu, 28 Apr 2011 15:04:25 +0000 (17:04 +0200)
		1	2
Lib/configparser.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_configparser.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history