Merge for issue #22191 fix

author Brett Cannon <brett@python.org>

Fri, 22 Aug 2014 14:46:07 +0000 (10:46 -0400)

committer Brett Cannon <brett@python.org>

Fri, 22 Aug 2014 14:46:07 +0000 (10:46 -0400)
author Brett Cannon <brett@python.org>
Fri, 22 Aug 2014 14:46:07 +0000 (10:46 -0400)
committer Brett Cannon <brett@python.org>
Fri, 22 Aug 2014 14:46:07 +0000 (10:46 -0400)
diff --cc Lib/test/test_warnings.py
Simple merge
diff --cc Lib/warnings.py
Simple merge
diff --cc Misc/ACKS
Simple merge
author	Brett Cannon <brett@python.org>
	Fri, 22 Aug 2014 14:46:07 +0000 (10:46 -0400)
committer	Brett Cannon <brett@python.org>
	Fri, 22 Aug 2014 14:46:07 +0000 (10:46 -0400)
		1	2
Lib/test/test_warnings.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/warnings.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history