[Zope3-checkins] CVS: Zope3/src/zope/app/startup - bootstrap.py:1.15.14.2 requestfactoryregistry.py:1.4.22.2 servertyperegistry.py:1.2.26.2 simpleregistry.py:1.6.10.2 sitedefinition.py:1.16.2.2

[Albertas Agejevas]

Update of /cvs-repository/Zope3/src/zope/app/startup
In directory cvs.zope.org:/tmp/cvs-serv16963/src/zope/app/startup

Modified Files:
      Tag: cw-mail-branch
	bootstrap.py requestfactoryregistry.py servertyperegistry.py 
	simpleregistry.py sitedefinition.py 
Log Message:
One more sync with HEAD.

=== Zope3/src/zope/app/startup/bootstrap.py 1.15.14.1 => 1.15.14.2 ===
--- Zope3/src/zope/app/startup/bootstrap.py:1.15.14.1	Sun Jun 22 10:23:31 2003
+++ Zope3/src/zope/app/startup/bootstrap.py	Mon Jun 23 10:20:24 2003
@@ -31,7 +31,7 @@
 from zope.app.services.service import ServiceRegistration
 from zope.app.services.hub import ObjectHub
 from zope.app.services.event import EventService
-from zope.app.services.errorr import ErrorReportingService
+from zope.app.services.error import ErrorReportingService
 from zope.app.services.principalannotation import PrincipalAnnotationService
 from zope.proxy import removeAllProxies
 from zope.app.event import publish


=== Zope3/src/zope/app/startup/requestfactoryregistry.py 1.4.22.1 => 1.4.22.2 ===


=== Zope3/src/zope/app/startup/servertyperegistry.py 1.2.26.1 => 1.2.26.2 ===


=== Zope3/src/zope/app/startup/simpleregistry.py 1.6.10.1 => 1.6.10.2 ===


=== Zope3/src/zope/app/startup/sitedefinition.py 1.16.2.1 => 1.16.2.2 ===