merge 3.3 (#22520)

author Benjamin Peterson <benjamin@python.org>

Tue, 30 Sep 2014 03:02:35 +0000 (23:02 -0400)

committer Benjamin Peterson <benjamin@python.org>

Tue, 30 Sep 2014 03:02:35 +0000 (23:02 -0400)
author Benjamin Peterson <benjamin@python.org>
Tue, 30 Sep 2014 03:02:35 +0000 (23:02 -0400)
committer Benjamin Peterson <benjamin@python.org>
Tue, 30 Sep 2014 03:02:35 +0000 (23:02 -0400)
diff --cc Misc/NEWS
Simple merge
diff --cc Objects/unicodeobject.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Tue, 30 Sep 2014 03:02:35 +0000 (23:02 -0400)
committer	Benjamin Peterson <benjamin@python.org>
	Tue, 30 Sep 2014 03:02:35 +0000 (23:02 -0400)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Objects/unicodeobject.c	patch \|	diff1 \|	diff2 \|	blob \| history