Merge with 3.2: Correctly detect bzip2 compressed streams with blocksizes other than...

diff --cc Lib/tarfile.py
Simple merge

diff --cc Lib/test/test_tarfile.py
Simple merge

diff --cc Misc/NEWS
index f941c63128f895642676e4655f0de46a5ab04ca9,8640d70c458e254f7a9cca790c1bb50e8da7d09f..c98c9561321ac33cec85d49fb9b2c1d3c5963a00
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -406,11 -90,11 +406,14 @@@ Core and Builtin
  Library
  -------
  
+ - tarfile.py: Correctly detect bzip2 compressed streams with blocksizes
+   other than 900k.
+ 
  - Issue #13439: Fix many errors in turtle docstrings.
  
 +- Issue #6715: Add a module 'lzma' for compression using the LZMA algorithm.
 +  Thanks to Per Øyvind Karlsen for the initial implementation.
 +
  - Issue #13487: Make inspect.getmodule robust against changes done to
    sys.modules while it is iterating over it.