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

........
  r86383 | antoine.pitrou | 2010-11-10 00:10:33 +0100 (mer., 10 nov. 2010) | 4 lines

  Issue #4471: Properly shutdown socket in IMAP.shutdown().  Patch by
  Lorenzo M. Catucci.
........
diff --git a/Misc/ACKS b/Misc/ACKS
index 0311ae9..4a36b6d 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -121,6 +121,7 @@
 Brett Cannon
 Mike Carlton
 Terry Carroll
+Lorenzo M. Catucci
 Donn Cave
 Per Cederqvist
 Octavian Cerna
diff --git a/Misc/NEWS b/Misc/NEWS
index 1893860..9f18bbd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -143,6 +143,9 @@
 Library
 -------
 
+- Issue #4471: Properly shutdown socket in IMAP.shutdown().  Patch by
+  Lorenzo M. Catucci.
+
 - Fix IMAP.login() to work properly.
 
 - Issue #10126: Fix distutils' test_build when Python was built with