Merged revisions 80983 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r80983 | benjamin.peterson | 2010-05-08 10:26:30 -0500 (Sat, 08 May 2010) | 1 line

  replace long with int
........