py-cvs-2001_07_13 (Rev 1.4) merge
py-cvs-2001_07_13 (Rev 1.4) merge

"Quick update to the extension mechanism (extend.py is gone, long live
config.txt)" --GvR

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator