merge 3.2 (closes #13908)

author Benjamin Peterson <benjamin@python.org>

Mon, 30 Jan 2012 01:17:07 +0000 (20:17 -0500)

committer Benjamin Peterson <benjamin@python.org>

Mon, 30 Jan 2012 01:17:07 +0000 (20:17 -0500)
author Benjamin Peterson <benjamin@python.org>
Mon, 30 Jan 2012 01:17:07 +0000 (20:17 -0500)
committer Benjamin Peterson <benjamin@python.org>
Mon, 30 Jan 2012 01:17:07 +0000 (20:17 -0500)
diff --cc Misc/NEWS
Simple merge
diff --cc Objects/typeobject.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Mon, 30 Jan 2012 01:17:07 +0000 (20:17 -0500)
committer	Benjamin Peterson <benjamin@python.org>
	Mon, 30 Jan 2012 01:17:07 +0000 (20:17 -0500)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Objects/typeobject.c	patch \|	diff1 \|	diff2 \|	blob \| history