merge 3.3 (#20374)

author Benjamin Peterson <benjamin@python.org>

Fri, 24 Jan 2014 05:33:25 +0000 (00:33 -0500)

committer Benjamin Peterson <benjamin@python.org>

Fri, 24 Jan 2014 05:33:25 +0000 (00:33 -0500)
author Benjamin Peterson <benjamin@python.org>
Fri, 24 Jan 2014 05:33:25 +0000 (00:33 -0500)
committer Benjamin Peterson <benjamin@python.org>
Fri, 24 Jan 2014 05:33:25 +0000 (00:33 -0500)
diff --cc Misc/NEWS
Simple merge
diff --cc Modules/readline.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Fri, 24 Jan 2014 05:33:25 +0000 (00:33 -0500)
committer	Benjamin Peterson <benjamin@python.org>
	Fri, 24 Jan 2014 05:33:25 +0000 (00:33 -0500)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/readline.c	patch \|	diff1 \|	diff2 \|	blob \| history