merge from 3.2

author Ned Deily <nad@acm.org>

Thu, 6 Oct 2011 21:24:31 +0000 (14:24 -0700)

committer Ned Deily <nad@acm.org>

Thu, 6 Oct 2011 21:24:31 +0000 (14:24 -0700)
author Ned Deily <nad@acm.org>
Thu, 6 Oct 2011 21:24:31 +0000 (14:24 -0700)
committer Ned Deily <nad@acm.org>
Thu, 6 Oct 2011 21:24:31 +0000 (14:24 -0700)
diff --cc Lib/pkgutil.py
Simple merge
diff --cc Lib/test/test_pydoc.py
Simple merge
author	Ned Deily <nad@acm.org>
	Thu, 6 Oct 2011 21:24:31 +0000 (14:24 -0700)
committer	Ned Deily <nad@acm.org>
	Thu, 6 Oct 2011 21:24:31 +0000 (14:24 -0700)
		1	2
Lib/pkgutil.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_pydoc.py	patch \|	diff1 \|	diff2 \|	blob \| history