Merge fix for #16163 from 3.3

author Nick Coghlan <ncoghlan@gmail.com>

Sun, 14 Apr 2013 13:01:11 +0000 (23:01 +1000)

committer Nick Coghlan <ncoghlan@gmail.com>

Sun, 14 Apr 2013 13:01:11 +0000 (23:01 +1000)
author Nick Coghlan <ncoghlan@gmail.com>
Sun, 14 Apr 2013 13:01:11 +0000 (23:01 +1000)
committer Nick Coghlan <ncoghlan@gmail.com>
Sun, 14 Apr 2013 13:01:11 +0000 (23:01 +1000)
diff --cc Lib/pkgutil.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Nick Coghlan <ncoghlan@gmail.com>
	Sun, 14 Apr 2013 13:01:11 +0000 (23:01 +1000)
committer	Nick Coghlan <ncoghlan@gmail.com>
	Sun, 14 Apr 2013 13:01:11 +0000 (23:01 +1000)
		1	2
Lib/pkgutil.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history