merge doc fixes from 3.2

author Georg Brandl <georg@python.org>

Sat, 17 Sep 2011 18:40:35 +0000 (20:40 +0200)

committer Georg Brandl <georg@python.org>

Sat, 17 Sep 2011 18:40:35 +0000 (20:40 +0200)
author Georg Brandl <georg@python.org>
Sat, 17 Sep 2011 18:40:35 +0000 (20:40 +0200)
committer Georg Brandl <georg@python.org>
Sat, 17 Sep 2011 18:40:35 +0000 (20:40 +0200)
diff --cc Doc/library/datetime.rst
Simple merge
diff --cc Doc/library/random.rst
Simple merge
author	Georg Brandl <georg@python.org>
	Sat, 17 Sep 2011 18:40:35 +0000 (20:40 +0200)
committer	Georg Brandl <georg@python.org>
	Sat, 17 Sep 2011 18:40:35 +0000 (20:40 +0200)
		1	2
Doc/library/datetime.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/library/random.rst	patch \|	diff1 \|	diff2 \|	blob \| history