Merged revisions 85423 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85423 | antoine.pitrou | 2010-10-13 19:14:16 +0200 (mer., 13 oct. 2010) | 3 lines

  Protect test_smtpnet against connection failures
........