Issue #17149: merge fix from 3.2.

author Mark Dickinson <dickinsm@gmail.com>

Sun, 10 Feb 2013 14:16:56 +0000 (14:16 +0000)

committer Mark Dickinson <dickinsm@gmail.com>

Sun, 10 Feb 2013 14:16:56 +0000 (14:16 +0000)
author Mark Dickinson <dickinsm@gmail.com>
Sun, 10 Feb 2013 14:16:56 +0000 (14:16 +0000)
committer Mark Dickinson <dickinsm@gmail.com>
Sun, 10 Feb 2013 14:16:56 +0000 (14:16 +0000)
diff --cc Lib/random.py
Simple merge
diff --cc Lib/test/test_random.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Mark Dickinson <dickinsm@gmail.com>
	Sun, 10 Feb 2013 14:16:56 +0000 (14:16 +0000)
committer	Mark Dickinson <dickinsm@gmail.com>
	Sun, 10 Feb 2013 14:16:56 +0000 (14:16 +0000)
		1	2
Lib/random.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_random.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history