Update of /projects/cvsroot/python/dist/src/Modules In directory monty:/usr/people/guido/python/src/Modules Modified Files: python.exp Log Message: remove ConflictError --Guido van Rossum (home page: http://www.python.org/~guido/)