Merged revisions 80228 via svnmerge from

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

................
  r80228 | giampaolo.rodola | 2010-04-20 00:05:54 +0200 (mar, 20 apr 2010) | 9 lines

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

  ........
    r80226 | giampaolo.rodola | 2010-04-19 23:46:28 +0200 (lun, 19 apr 2010) | 1 line

    Fix Issue #4841: timeout is now applied for connections resulting from PORT/EPRT commands
  ........
................