Update of /cvs-repository/Zope2/lib/python/Products/ZCatalog In directory korak.digicool.com:/home/brian/temp/zope_trunk/lib/python/Products/ZCatalog Modified Files: Catalog.py Log Message: merge from branch