Merged revisions 65826 via svnmerge from

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

........
  r65826 | benjamin.peterson | 2008-08-18 13:13:17 -0500 (Mon, 18 Aug 2008) | 1 line

  bring back the old API
........