Merged revisions 73140 via svnmerge from

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

................
  r73140 | mark.dickinson | 2009-06-02 08:41:26 +0100 (Tue, 02 Jun 2009) | 9 lines

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

  ........
    r73138 | mark.dickinson | 2009-06-02 08:39:26 +0100 (Tue, 02 Jun 2009) | 1 line

    Typo in socket.py.  Thanks Pablo Torres Navarrete.
  ........
................