Merged revisions 80036 via svnmerge from

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

................
  r80036 | mark.dickinson | 2010-04-13 12:43:10 +0100 (Tue, 13 Apr 2010) | 9 lines

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

  ........
    r80035 | mark.dickinson | 2010-04-13 12:37:23 +0100 (Tue, 13 Apr 2010) | 1 line

    In test_winsound, don't try to import _winreg until after checking that winsound is supported.
  ........
................