Merged revisions 80859 via svnmerge from

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

................
  r80859 | brian.curtin | 2010-05-05 22:05:50 -0500 (Wed, 05 May 2010) | 12 lines

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

  ........
    r80857 | brian.curtin | 2010-05-05 21:54:44 -0500 (Wed, 05 May 2010) | 5 lines

    Fix #7863. Properly identify Windows 7 and Server 2008 R2.

    Removed various unused code and added a way to correctly determine
    server vs. workstation via the registry.
  ........
................