merge 3.3 (#16906)

author Benjamin Peterson <benjamin@python.org>

Wed, 9 Jan 2013 15:52:22 +0000 (09:52 -0600)

committer Benjamin Peterson <benjamin@python.org>

Wed, 9 Jan 2013 15:52:22 +0000 (09:52 -0600)
author Benjamin Peterson <benjamin@python.org>
Wed, 9 Jan 2013 15:52:22 +0000 (09:52 -0600)
committer Benjamin Peterson <benjamin@python.org>
Wed, 9 Jan 2013 15:52:22 +0000 (09:52 -0600)
diff --cc Misc/NEWS
Simple merge
diff --cc Objects/unicodeobject.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Wed, 9 Jan 2013 15:52:22 +0000 (09:52 -0600)
committer	Benjamin Peterson <benjamin@python.org>
	Wed, 9 Jan 2013 15:52:22 +0000 (09:52 -0600)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Objects/unicodeobject.c	patch \|	diff1 \|	diff2 \|	blob \| history