Merged revisions 74949 via svnmerge from

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

................
  r74949 | thomas.heller | 2009-09-19 12:12:45 +0200 (Sa, 19 Sep 2009) | 9 lines

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

  ........
    r74948 | thomas.heller | 2009-09-19 12:04:54 +0200 (Sa, 19 Sep 2009) | 1 line

    Remove unused variable and static function to fix compiler warnings.
  ........
................