Reworked version of rev 1.49. Fixes a strange problem with the re module in Python 2.1c1. Works now with the official 2.1 release