Merged revisions 69855 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69855 | benjamin.peterson | 2009-02-21 17:09:33 -0600 (Sat, 21 Feb 2009) | 1 line

  fix compiler warnings
........