merge 3.4 (#21404)

benjaminp · benjaminp · commit 33919e842378 · 2014-06-07T12:48:09.000-07:00
diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst
@@ -81,6 +81,10 @@ Some facts and figures:
    If *fileobj* is specified, it is used as an alternative to a :term:`file object`
    opened in binary mode for *name*. It is supposed to be at position 0.
 
+   For modes ``'w:gz'``, ``'r:gz'``, ``'w:bz2'``, ``'r:bz2'``, :func:`tarfile.open`
+   accepts the keyword argument *compresslevel* to specify the compression level of
+   the file.
+
    For special purposes, there is a second format for *mode*:
    ``'filemode|[compression]'``.  :func:`tarfile.open` will return a :class:`TarFile`
    object that processes its data as a stream of blocks.  No random seeking will
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -196,6 +196,7 @@ Roger Burnham
 Alastair Burt
 Tarn Weisner Burton
 Lee Busby
+Katherine Busch
 Ralph Butler
 Nicolas Cadou
 Jp Calderone
