Merged revisions 80027 via svnmerge from

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

................
  r80027 | brian.curtin | 2010-04-12 21:32:40 -0500 (Mon, 12 Apr 2010) | 11 lines

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

  ........
    r80026 | brian.curtin | 2010-04-12 21:25:20 -0500 (Mon, 12 Apr 2010) | 4 lines

    Fix #7306. Add skips to test_winsound when no default sound is configured.

    These failures occur on a Windows Server 2003 machine I test on.
  ........
................