merge with 3.3

diff --cc Doc/tools/sphinxext/pyspecific.py
index df6e48adceffd765b26629a7df20b0e10ff83c0a,388fe3a99b1cc858da88fb91599328d8450e3450..2b5de1421e73082d6f15f6dca022b489fabe86d8
--- 1/Doc/tools/sphinxext/pyspecific.py
--- 2/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@@ -10,10 -10,15 +10,15 @@@
  """
  
  ISSUE_URI = 'http://bugs.python.org/issue%s'
 -SOURCE_URI = 'http://hg.python.org/cpython/file/3.3/%s'
 +SOURCE_URI = 'http://hg.python.org/cpython/file/default/%s'
  
  from docutils import nodes, utils
+ 
+ import sphinx
  from sphinx.util.nodes import split_explicit_title
+ from sphinx.writers.html import HTMLTranslator
+ from sphinx.writers.latex import LaTeXTranslator
+ from sphinx.locale import versionlabels
  
  # monkey-patch reST parser to disable alphabetic and roman enumerated lists
  from docutils.parsers.rst.states import Body