Correctly merging #9319 into 3.3?

author Jesus Cea <jcea@jcea.es>

Mon, 25 Apr 2011 01:46:43 +0000 (03:46 +0200)

committer Jesus Cea <jcea@jcea.es>

Mon, 25 Apr 2011 01:46:43 +0000 (03:46 +0200)
author Jesus Cea <jcea@jcea.es>
Mon, 25 Apr 2011 01:46:43 +0000 (03:46 +0200)
committer Jesus Cea <jcea@jcea.es>
Mon, 25 Apr 2011 01:46:43 +0000 (03:46 +0200)
diff --cc Lib/test/test_imp.py
Simple merge
diff --cc Parser/tokenizer.c
Simple merge
author	Jesus Cea <jcea@jcea.es>
	Mon, 25 Apr 2011 01:46:43 +0000 (03:46 +0200)
committer	Jesus Cea <jcea@jcea.es>
	Mon, 25 Apr 2011 01:46:43 +0000 (03:46 +0200)
		1	2
Lib/test/test_imp.py	patch \|	diff1 \|	diff2 \|	blob \| history
Parser/tokenizer.c	patch \|	diff1 \|	diff2 \|	blob \| history