merge 3.3 (#5289)

author Benjamin Peterson <benjamin@python.org>

Mon, 4 Feb 2013 00:26:51 +0000 (19:26 -0500)

committer Benjamin Peterson <benjamin@python.org>

Mon, 4 Feb 2013 00:26:51 +0000 (19:26 -0500)
author Benjamin Peterson <benjamin@python.org>
Mon, 4 Feb 2013 00:26:51 +0000 (19:26 -0500)
committer Benjamin Peterson <benjamin@python.org>
Mon, 4 Feb 2013 00:26:51 +0000 (19:26 -0500)
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Mon, 4 Feb 2013 00:26:51 +0000 (19:26 -0500)
committer	Benjamin Peterson <benjamin@python.org>
	Mon, 4 Feb 2013 00:26:51 +0000 (19:26 -0500)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history