merge 3.2 (#11627)

author Benjamin Peterson <benjamin@python.org>

Fri, 15 Jul 2011 19:10:35 +0000 (14:10 -0500)

committer Benjamin Peterson <benjamin@python.org>

Fri, 15 Jul 2011 19:10:35 +0000 (14:10 -0500)
author Benjamin Peterson <benjamin@python.org>
Fri, 15 Jul 2011 19:10:35 +0000 (14:10 -0500)
committer Benjamin Peterson <benjamin@python.org>
Fri, 15 Jul 2011 19:10:35 +0000 (14:10 -0500)
diff --cc Misc/NEWS
Simple merge
diff --cc Python/ceval.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Fri, 15 Jul 2011 19:10:35 +0000 (14:10 -0500)
committer	Benjamin Peterson <benjamin@python.org>
	Fri, 15 Jul 2011 19:10:35 +0000 (14:10 -0500)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/ceval.c	patch \|	diff1 \|	diff2 \|	blob \| history