merge from 3.2

author Georg Brandl <georg@python.org>

Mon, 23 Jan 2012 19:19:46 +0000 (20:19 +0100)

committer Georg Brandl <georg@python.org>

Mon, 23 Jan 2012 19:19:46 +0000 (20:19 +0100)
author Georg Brandl <georg@python.org>
Mon, 23 Jan 2012 19:19:46 +0000 (20:19 +0100)
committer Georg Brandl <georg@python.org>
Mon, 23 Jan 2012 19:19:46 +0000 (20:19 +0100)
diff --cc Doc/library/functools.rst
Simple merge
diff --cc Doc/library/stdtypes.rst
Simple merge
author	Georg Brandl <georg@python.org>
	Mon, 23 Jan 2012 19:19:46 +0000 (20:19 +0100)
committer	Georg Brandl <georg@python.org>
	Mon, 23 Jan 2012 19:19:46 +0000 (20:19 +0100)
		1	2
Doc/library/functools.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/library/stdtypes.rst	patch \|	diff1 \|	diff2 \|	blob \| history