merge 3.3 (#17550)

author Benjamin Peterson <benjamin@python.org>

Tue, 26 Mar 2013 12:58:16 +0000 (08:58 -0400)

committer Benjamin Peterson <benjamin@python.org>

Tue, 26 Mar 2013 12:58:16 +0000 (08:58 -0400)
author Benjamin Peterson <benjamin@python.org>
Tue, 26 Mar 2013 12:58:16 +0000 (08:58 -0400)
committer Benjamin Peterson <benjamin@python.org>
Tue, 26 Mar 2013 12:58:16 +0000 (08:58 -0400)
diff --cc Misc/NEWS
Simple merge
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Tue, 26 Mar 2013 12:58:16 +0000 (08:58 -0400)
committer	Benjamin Peterson <benjamin@python.org>
	Tue, 26 Mar 2013 12:58:16 +0000 (08:58 -0400)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history