Merge with 3.2.

author Georg Brandl <georg@python.org>

Sat, 13 Aug 2011 09:48:40 +0000 (11:48 +0200)

committer Georg Brandl <georg@python.org>

Sat, 13 Aug 2011 09:48:40 +0000 (11:48 +0200)
author Georg Brandl <georg@python.org>
Sat, 13 Aug 2011 09:48:40 +0000 (11:48 +0200)
committer Georg Brandl <georg@python.org>
Sat, 13 Aug 2011 09:48:40 +0000 (11:48 +0200)
diff --cc Lib/tarfile.py
Simple merge
diff --cc Lib/test/test_tarfile.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Georg Brandl <georg@python.org>
	Sat, 13 Aug 2011 09:48:40 +0000 (11:48 +0200)
committer	Georg Brandl <georg@python.org>
	Sat, 13 Aug 2011 09:48:40 +0000 (11:48 +0200)
		1	2
Lib/tarfile.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_tarfile.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history