Merged revisions 74641 via svnmerge from

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

................
  r74641 | brett.cannon | 2009-09-03 14:29:20 -0700 (Thu, 03 Sep 2009) | 14 lines

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

  ........
    r74640 | brett.cannon | 2009-09-03 14:25:21 -0700 (Thu, 03 Sep 2009) | 7 lines

    test_platform fails on OS X Snow Leopard because the UNIX command to get the
    canonical version, sw_vers, leaves off trailing zeros in the version number
    (e.g. 10.6 instead of 10.6.0). Test now compensates by tacking on extra zeros
    for the test comparison.

    Fixes issue #6806.
  ........
................