merge 3.2: issue 14629

author Martin v. Löwis <martin@v.loewis.de>

Fri, 20 Apr 2012 12:37:17 +0000 (14:37 +0200)

committer Martin v. Löwis <martin@v.loewis.de>

Fri, 20 Apr 2012 12:37:17 +0000 (14:37 +0200)
author Martin v. Löwis <martin@v.loewis.de>
Fri, 20 Apr 2012 12:37:17 +0000 (14:37 +0200)
committer Martin v. Löwis <martin@v.loewis.de>
Fri, 20 Apr 2012 12:37:17 +0000 (14:37 +0200)
diff --cc Lib/test/test_tokenize.py
Simple merge
diff --cc Lib/tokenize.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Martin v. Löwis <martin@v.loewis.de>
	Fri, 20 Apr 2012 12:37:17 +0000 (14:37 +0200)
committer	Martin v. Löwis <martin@v.loewis.de>
	Fri, 20 Apr 2012 12:37:17 +0000 (14:37 +0200)
		1	2
Lib/test/test_tokenize.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/tokenize.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history