Merge with 3.3

author Terry Jan Reedy <tjreedy@udel.edu>

Tue, 18 Feb 2014 04:12:37 +0000 (23:12 -0500)

committer Terry Jan Reedy <tjreedy@udel.edu>

Tue, 18 Feb 2014 04:12:37 +0000 (23:12 -0500)
author Terry Jan Reedy <tjreedy@udel.edu>
Tue, 18 Feb 2014 04:12:37 +0000 (23:12 -0500)
committer Terry Jan Reedy <tjreedy@udel.edu>
Tue, 18 Feb 2014 04:12:37 +0000 (23:12 -0500)
diff --cc Lib/tokenize.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Terry Jan Reedy <tjreedy@udel.edu>
	Tue, 18 Feb 2014 04:12:37 +0000 (23:12 -0500)
committer	Terry Jan Reedy <tjreedy@udel.edu>
	Tue, 18 Feb 2014 04:12:37 +0000 (23:12 -0500)
		1	2
Lib/tokenize.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history