merge 2.7.2 release branch with fix for #12009

author Benjamin Peterson <benjamin@python.org>

Fri, 10 Jun 2011 16:33:41 +0000 (11:33 -0500)

committer Benjamin Peterson <benjamin@python.org>

Fri, 10 Jun 2011 16:33:41 +0000 (11:33 -0500)
author Benjamin Peterson <benjamin@python.org>
Fri, 10 Jun 2011 16:33:41 +0000 (11:33 -0500)
committer Benjamin Peterson <benjamin@python.org>
Fri, 10 Jun 2011 16:33:41 +0000 (11:33 -0500)
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Fri, 10 Jun 2011 16:33:41 +0000 (11:33 -0500)
committer	Benjamin Peterson <benjamin@python.org>
	Fri, 10 Jun 2011 16:33:41 +0000 (11:33 -0500)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history