merge 3.3 (#17863)

author Benjamin Peterson <benjamin@python.org>

Mon, 29 Apr 2013 14:23:31 +0000 (10:23 -0400)

committer Benjamin Peterson <benjamin@python.org>

Mon, 29 Apr 2013 14:23:31 +0000 (10:23 -0400)
author Benjamin Peterson <benjamin@python.org>
Mon, 29 Apr 2013 14:23:31 +0000 (10:23 -0400)
committer Benjamin Peterson <benjamin@python.org>
Mon, 29 Apr 2013 14:23:31 +0000 (10:23 -0400)
diff --cc Misc/NEWS
Simple merge
diff --cc Python/pythonrun.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Mon, 29 Apr 2013 14:23:31 +0000 (10:23 -0400)
committer	Benjamin Peterson <benjamin@python.org>
	Mon, 29 Apr 2013 14:23:31 +0000 (10:23 -0400)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/pythonrun.c	patch \|	diff1 \|	diff2 \|	blob \| history