Update of /cvs-repository/Zope2/lib/python/Zope In directory korak.digicool.com:/projects/users/jim/lib/python/Zope Modified Files: __init__.py Log Message: Changed the conflict log message to be less alarming. In fact, this *should* probably be blather, rather than info, but we aren't logging blather right now.