merge 3.2 (#24044)

author Benjamin Peterson <benjamin@python.org>

Thu, 23 Apr 2015 21:05:07 +0000 (17:05 -0400)

committer Benjamin Peterson <benjamin@python.org>

Thu, 23 Apr 2015 21:05:07 +0000 (17:05 -0400)
author Benjamin Peterson <benjamin@python.org>
Thu, 23 Apr 2015 21:05:07 +0000 (17:05 -0400)
committer Benjamin Peterson <benjamin@python.org>
Thu, 23 Apr 2015 21:05:07 +0000 (17:05 -0400)
diff --cc Misc/NEWS
Simple merge
diff --cc Objects/listobject.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Thu, 23 Apr 2015 21:05:07 +0000 (17:05 -0400)
committer	Benjamin Peterson <benjamin@python.org>
	Thu, 23 Apr 2015 21:05:07 +0000 (17:05 -0400)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Objects/listobject.c	patch \|	diff1 \|	diff2 \|	blob \| history