Merged revisions 81146 via svnmerge from

Merged revisions 81146 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81146 | benjamin.peterson | 2010-05-13 16:16:51 -0500 (Thu, 13 May 2010) | 9 lines

  Merged revisions 81145 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r81145 | benjamin.peterson | 2010-05-13 16:14:10 -0500 (Thu, 13 May 2010) | 1 line

    rip out mention of types.ListType #8703
  ........
................