Merged revisions 76485 via svnmerge from

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

................
  r76485 | mark.dickinson | 2009-11-24 10:59:34 +0000 (Tue, 24 Nov 2009) | 9 lines

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

  ........
    r76483 | mark.dickinson | 2009-11-24 10:54:58 +0000 (Tue, 24 Nov 2009) | 2 lines

    round(0, "ermintrude") succeeded instead of producing a TypeError.  Fix this.
  ........
................