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

........
  r80368 | antoine.pitrou | 2010-04-22 15:19:31 +0200 (jeu., 22 avril 2010) | 3 lines

  Fix mailcap.py built-in test.
........
  r80369 | antoine.pitrou | 2010-04-22 15:30:10 +0200 (jeu., 22 avril 2010) | 5 lines

  Issue #8496: make mailcap.lookup() always return a list, rather than an iterator.
  Patch by Gregory Nofi.
........
diff --git a/Misc/NEWS b/Misc/NEWS
index 6b31774..ab687ff 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,9 @@
 Library
 -------
 
+- Issue #8496: make mailcap.lookup() always return a list, rather than an
+  iterator.  Patch by Gregory Nofi.
+
 - Issue #8195: Fix a crash in sqlite Connection.create_collation() if the
   collation name contains a surrogate character.