merge with 3.3

author Georg Brandl <georg@python.org>

Sun, 30 Sep 2012 13:10:34 +0000 (15:10 +0200)

committer Georg Brandl <georg@python.org>

Sun, 30 Sep 2012 13:10:34 +0000 (15:10 +0200)
author Georg Brandl <georg@python.org>
Sun, 30 Sep 2012 13:10:34 +0000 (15:10 +0200)
committer Georg Brandl <georg@python.org>
Sun, 30 Sep 2012 13:10:34 +0000 (15:10 +0200)
diff --cc Doc/tools/sphinxext/pyspecific.py
Simple merge
diff --cc Doc/whatsnew/index.rst
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Georg Brandl <georg@python.org>
	Sun, 30 Sep 2012 13:10:34 +0000 (15:10 +0200)
committer	Georg Brandl <georg@python.org>
	Sun, 30 Sep 2012 13:10:34 +0000 (15:10 +0200)
		1	2
Doc/tools/sphinxext/pyspecific.py	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/whatsnew/index.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history