merge 3.3 (closes #22519)

author Benjamin Peterson <benjamin@python.org>

Mon, 29 Sep 2014 23:09:49 +0000 (19:09 -0400)

committer Benjamin Peterson <benjamin@python.org>

Mon, 29 Sep 2014 23:09:49 +0000 (19:09 -0400)
author Benjamin Peterson <benjamin@python.org>
Mon, 29 Sep 2014 23:09:49 +0000 (19:09 -0400)
committer Benjamin Peterson <benjamin@python.org>
Mon, 29 Sep 2014 23:09:49 +0000 (19:09 -0400)
diff --cc Misc/NEWS
Simple merge
diff --cc Objects/bytesobject.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Mon, 29 Sep 2014 23:09:49 +0000 (19:09 -0400)
committer	Benjamin Peterson <benjamin@python.org>
	Mon, 29 Sep 2014 23:09:49 +0000 (19:09 -0400)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Objects/bytesobject.c	patch \|	diff1 \|	diff2 \|	blob \| history