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

................
  r82407 | giampaolo.rodola | 2010-06-30 19:47:39 +0200 (mer, 30 giu 2010) | 9 lines

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

  ........
    r82404 | giampaolo.rodola | 2010-06-30 19:38:28 +0200 (mer, 30 giu 2010) | 1 line

    fix issue #6589: cleanup asyncore.socket_map if smtpd.SMTPServer constructor raises an exception
  ........
................
diff --git a/Misc/NEWS b/Misc/NEWS
index 5be3e1c..e720196 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -67,6 +67,9 @@
 Library
 -------
 
+- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor 
+  raises an exception.
+
 - Issue #9075: In the ssl module, remove the setting of a ``debug`` flag
   on an OpenSSL structure.