Merged revisions 68174 via svnmerge from

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

........
  r68174 | benjamin.peterson | 2009-01-02 14:47:27 -0600 (Fri, 02 Jan 2009) | 1 line

  fix compilation on non-Windows platforms
........