final round of __all__ lists (I hope) - skipped urllib2 because Moshe may be
giving it a slight facelift
diff --git a/Lib/tokenize.py b/Lib/tokenize.py
index 9f46612..789d130 100644
--- a/Lib/tokenize.py
+++ b/Lib/tokenize.py
@@ -14,11 +14,15 @@
 import string, re
 from token import *
 
+import token
+__all__ = [x for x in dir(token) if x[0] != '_'] + ["COMMENT", "tokenize", "NL"]
+del token
+
 COMMENT = N_TOKENS
 tok_name[COMMENT] = 'COMMENT'
 NL = N_TOKENS + 1
 tok_name[NL] = 'NL'
-
+N_TOKENS += 2
 
 # Changes from 1.3:
 #     Ignore now accepts \f as whitespace.  Operator now includes '**'.