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

........
  r68611 | mark.dickinson | 2009-01-15 14:54:37 +0000 (Thu, 15 Jan 2009) | 2 lines

  Issue #4397.  Fix occasional test_socket failure on OS X.
........
  r68612 | mark.dickinson | 2009-01-15 14:58:28 +0000 (Thu, 15 Jan 2009) | 2 lines

  Comment typo
........
  r68613 | mark.dickinson | 2009-01-15 15:17:43 +0000 (Thu, 15 Jan 2009) | 2 lines

  Another typo fix.
........
2 files changed