Merged revisions 61330 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r61330 | georg.brandl | 2008-03-09 19:18:30 +0100 (Sun, 09 Mar 2008) | 2 lines

  Update for newest Sphinx.
........