Branch merge

diff --cc Doc/library/bz2.rst
Simple merge

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index d3a3b9e18d02dc92b1a2fec5281f4029c5ea107a,271c5b7423ba568ac481287f7b2faa23834ab5fd..70c5f10071a0503264792399838faaa7bbfdbb52
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -113,46 -97,8 +113,48 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #2945: Make the distutils upload command aware of bdist_rpm products.
+ 
 +- Issue #13933: IDLE auto-complete did not work with some imported
 +  module, like hashlib.  (Patch by Roger Serwy)
 +
 +- Issue #13901: Prevent test_distutils failures on OS X with --enable-shared.
 +
 +- Issue #13676: Handle strings with embedded zeros correctly in sqlite3.
 +
 +- Issue #13506: Add '' to path for IDLE Shell when started and restarted with Restart Shell.
 +  Original patches by Marco Scataglini and Roger Serwy.
 +
 +- Issue #13848: open() and the FileIO constructor now check for NUL
 +  characters in the file name.  Patch by Hynek Schlawack.
 +
 +- Issue #13806: The size check in audioop decompression functions was too
 +  strict and could reject valid compressed data.  Patch by Oleg Plakhotnyuk.
 +
 +- Issue #13812: When a multiprocessing Process child raises an exception,
 +  flush stderr after printing the exception traceback.
 +
 +- Issue #13885: CVE-2011-3389: the _ssl module would always disable the CBC
 +  IV attack countermeasure.
 +
 +- Issue #13772: In os.symlink() under Windows, do not try to guess the link
 +  target's type (file or directory).  The detection was buggy and made the
 +  call non-atomic (therefore prone to race conditions).
 +
 +- Issue #6631: Disallow relative file paths in urllib urlopen methods.
 +
 +- Issue #13722: Avoid silencing ImportErrors when initializing the codecs
 +  registry.
 +
 +- Issue #13781: Fix GzipFile bug that caused an exception to be raised when
 +  opening for writing using a fileobj returned by os.fdopen().
 +
 +- Issue #13803: Under Solaris, distutils doesn't include bitness
 +  in the directory name.
 +
 +- Issue #13589: Fix some serialization primitives in the aifc module.
 +  Patch by Oleg Plakhotnyuk.
 +
  - Issue #13642: Unquote before b64encoding user:password during Basic
    Authentication. Patch contributed by Joonas Kuorilehto.