Update of /cvs-repository/Zope2/lib/python/Products/ZCatalog In directory korak.digicool.com:/tmp/cvs-serv3760/lib/python/Products/ZCatalog Modified Files: ZCatalog.py Log Message: Merged changes from the cDocumentTemplateCleanup branch.