Update of /cvs-repository/Zope2/lib/python/Products/ZCatalog In directory korak.digicool.com:/tmp/cvs-serv8419/lib/python/Products/ZCatalog Modified Files: CatalogPathAwareness.py Log Message: Fix mismerge, which partly undid ChrisM's move to DTMLFile.