Merge 3.2

author Michael Foord <michael@voidspace.org.uk>

Sun, 18 Dec 2011 22:09:27 +0000 (22:09 +0000)

committer Michael Foord <michael@voidspace.org.uk>

Sun, 18 Dec 2011 22:09:27 +0000 (22:09 +0000)
author Michael Foord <michael@voidspace.org.uk>
Sun, 18 Dec 2011 22:09:27 +0000 (22:09 +0000)
committer Michael Foord <michael@voidspace.org.uk>
Sun, 18 Dec 2011 22:09:27 +0000 (22:09 +0000)
diff --cc Lib/inspect.py
Simple merge
diff --cc Lib/test/test_inspect.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Michael Foord <michael@voidspace.org.uk>
	Sun, 18 Dec 2011 22:09:27 +0000 (22:09 +0000)
committer	Michael Foord <michael@voidspace.org.uk>
	Sun, 18 Dec 2011 22:09:27 +0000 (22:09 +0000)
		1	2
Lib/inspect.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_inspect.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history