merge 3.4

author Benjamin Peterson <benjamin@python.org>

Mon, 14 Apr 2014 02:32:12 +0000 (22:32 -0400)

committer Benjamin Peterson <benjamin@python.org>

Mon, 14 Apr 2014 02:32:12 +0000 (22:32 -0400)
author Benjamin Peterson <benjamin@python.org>
Mon, 14 Apr 2014 02:32:12 +0000 (22:32 -0400)
committer Benjamin Peterson <benjamin@python.org>
Mon, 14 Apr 2014 02:32:12 +0000 (22:32 -0400)
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Mon, 14 Apr 2014 02:32:12 +0000 (22:32 -0400)
committer	Benjamin Peterson <benjamin@python.org>
	Mon, 14 Apr 2014 02:32:12 +0000 (22:32 -0400)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history