merge 3.2

author Benjamin Peterson <benjamin@python.org>

Mon, 2 Apr 2012 15:28:49 +0000 (11:28 -0400)

committer Benjamin Peterson <benjamin@python.org>

Mon, 2 Apr 2012 15:28:49 +0000 (11:28 -0400)
author Benjamin Peterson <benjamin@python.org>
Mon, 2 Apr 2012 15:28:49 +0000 (11:28 -0400)
committer Benjamin Peterson <benjamin@python.org>
Mon, 2 Apr 2012 15:28:49 +0000 (11:28 -0400)
diff --cc Misc/NEWS
Simple merge
diff --cc Modules/_threadmodule.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Mon, 2 Apr 2012 15:28:49 +0000 (11:28 -0400)
committer	Benjamin Peterson <benjamin@python.org>
	Mon, 2 Apr 2012 15:28:49 +0000 (11:28 -0400)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_threadmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history