Merged revisions 71018,71020-71021 via svnmerge from

Merged revisions 71018,71020-71021 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r71018 | benjamin.peterson | 2009-04-01 20:50:37 -0500 (Wed, 01 Apr 2009) | 1 line

  fix ref leaks
........
  r71020 | benjamin.peterson | 2009-04-01 21:27:20 -0500 (Wed, 01 Apr 2009) | 1 line

  rewrite error handling to make sense
........
  r71021 | benjamin.peterson | 2009-04-01 21:27:56 -0500 (Wed, 01 Apr 2009) | 1 line

  remove unused variable
........