merge 3.3

author Benjamin Peterson <benjamin@python.org>

Mon, 29 Apr 2013 13:08:33 +0000 (09:08 -0400)

committer Benjamin Peterson <benjamin@python.org>

Mon, 29 Apr 2013 13:08:33 +0000 (09:08 -0400)
author Benjamin Peterson <benjamin@python.org>
Mon, 29 Apr 2013 13:08:33 +0000 (09:08 -0400)
committer Benjamin Peterson <benjamin@python.org>
Mon, 29 Apr 2013 13:08:33 +0000 (09:08 -0400)
diff --cc Misc/NEWS
Simple merge
diff --cc Python/import.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Mon, 29 Apr 2013 13:08:33 +0000 (09:08 -0400)
committer	Benjamin Peterson <benjamin@python.org>
	Mon, 29 Apr 2013 13:08:33 +0000 (09:08 -0400)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/import.c	patch \|	diff1 \|	diff2 \|	blob \| history