Merge cleanup.

diff --cc Misc/NEWS
index c671107f6e8c4eb3927dc208df37012c9bd05938,1da9d2e34b794fbe553b7db15094d4a595ce8aee..9b68a72c0d760ce8077f241261b380cc7055701f
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -49,27 -42,9 +46,30 @@@ Core and Builtin
  
  Library
  -------
 +
+ - Issue #11662: Make urllib and urllib2 ignore redirections if the
+   scheme is not HTTP, HTTPS or FTP (CVE-2011-1521).
+ 
 +- Issue #11256: Fix inspect.getcallargs on functions that take only keyword
 +  arguments.
 +
 +- Issue #11696: Fix ID generation in msilib.
 +
 +- Issue #9696: Fix exception incorrectly raised by xdrlib.Packer.pack_int when
 +  trying to pack a negative (in-range) integer.
 +
 +- Issue #11675: multiprocessing.[Raw]Array objects created from an integer size
 +  are now zeroed on creation.  This matches the behaviour specified by the
 +  documentation.
 +
 +- Issue #7639: Fix short file name generation in bdist_msi.
 +
 +- Issue #11666: let help() display named tuple attributes and methods
 +  that start with a leading underscore.
 +
 +- Issue #11673: Fix multiprocessing Array and RawArray constructors to accept a
 +  size of type 'long', rather than only accepting 'int'.
 +
  - Issue #10042: Fixed the total_ordering decorator to handle cross-type
    comparisons that could lead to infinite recursion.