Upgrade to Zope 2.4.1.

18 files changed, 1320 insertions, 1266 deletions

diff --git a/www/zope/Makefile b/www/zope/Makefile
index 903b9af286cc..9b7eca1e4070 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -6,14 +6,12 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTVERSION=	2.4.1
+PORTREVISION=	0
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix_2001-08-04/
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
-DISTFILES=	${DISTNAME}.tgz \
-		Hotfix_2001_08_04.tgz
+DISTFILES=	${DISTNAME}.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
@@ -64,7 +62,7 @@ do-install:
 	@${ECHO} "===>   Please be patient, some builds need their time."
 	@${ECHO} "===>   Copying..."
 	@${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/
-	@${CP} -Rp ${WRKDIR}/lib ${ZOPEBASEDIR}/
+	#@${CP} -Rp ${WRKDIR}/lib ${ZOPEBASEDIR}/
 	@#
 	@${CHMOD} -R u+w ${ZOPEBASEDIR}
 	@(cd ${ZOPEBASEDIR} && ${PYTHON_CMD} w_pcgi.py)
diff --git a/www/zope/distinfo b/www/zope/distinfo
index b8a73d1a5fc4..88fc8fe24753 100644
--- a/www/zope/distinfo
+++ b/www/zope/distinfo
@@ -1,2 +1 @@
-MD5 (zope/Zope-2.4.0-src.tgz) = 1a41e096a80411bccf61cd862bc3cc20
-MD5 (zope/Hotfix_2001_08_04.tgz) = c060bf5f1a22b6d93ea3314cae9ea0cc
+MD5 (zope/Zope-2.4.1-src.tgz) = 9bb93c8431118f39310a255aa6f09609
diff --git a/www/zope/pkg-plist b/www/zope/pkg-plist
index 52e83f3abee0..42421e73db7b 100644
--- a/www/zope/pkg-plist
+++ b/www/zope/pkg-plist
@@ -37,50 +37,23 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/ZService.pyc
 %%ZOPEBASEDIR%%/ZServer/__init__.py
 %%ZOPEBASEDIR%%/ZServer/__init__.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/__init__.py
-%%ZOPEBASEDIR%%/ZServer/medusa/__init__.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.py
-%%ZOPEBASEDIR%%/ZServer/medusa/fifo.py
-%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.py
-%%ZOPEBASEDIR%%/ZServer/medusa/out
-%%ZOPEBASEDIR%%/ZServer/medusa/medusa.html
-%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/ANNOUNCE.txt
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.py
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.py
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.py
-%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/ANNOUNCE_970922.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/INSTALL.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/Makefile
-%%ZOPEBASEDIR%%/ZServer/medusa/asyncore.py.old
+%%ZOPEBASEDIR%%/ZServer/medusa/__init__.py
+%%ZOPEBASEDIR%%/ZServer/medusa/__init__.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.py
+%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/auth_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/chat_server.py
-%%ZOPEBASEDIR%%/ZServer/medusa/continuation.py
 %%ZOPEBASEDIR%%/ZServer/medusa/auth_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/chat_server.py
 %%ZOPEBASEDIR%%/ZServer/medusa/chat_server.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/continuation.py
 %%ZOPEBASEDIR%%/ZServer/medusa/continuation.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/fifo.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.py
-%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/contrib/bobo_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/contrib/sample_cgi.py
 %%ZOPEBASEDIR%%/ZServer/medusa/contrib/bobo_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/contrib/sample_cgi.py
 %%ZOPEBASEDIR%%/ZServer/medusa/contrib/sample_cgi.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/counter.py
 %%ZOPEBASEDIR%%/ZServer/medusa/counter.pyc
@@ -95,10 +68,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/docs/data_flow.html
 %%ZOPEBASEDIR%%/ZServer/medusa/docs/producers.gif
 %%ZOPEBASEDIR%%/ZServer/medusa/docs/proxy_notes.txt
+%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.py
+%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/fifo.py
+%%ZOPEBASEDIR%%/ZServer/medusa/fifo.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/filesys.py
 %%ZOPEBASEDIR%%/ZServer/medusa/filesys.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/ftp_server.py
 %%ZOPEBASEDIR%%/ZServer/medusa/ftp_server.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.py
+%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/http_date.py
 %%ZOPEBASEDIR%%/ZServer/medusa/http_date.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/http_server.py
@@ -107,15 +86,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/logger.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/m_syslog.py
 %%ZOPEBASEDIR%%/ZServer/medusa/m_syslog.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/medusa.html
 %%ZOPEBASEDIR%%/ZServer/medusa/medusa_gif.py
 %%ZOPEBASEDIR%%/ZServer/medusa/medusa_gif.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/mime_type_table.py
 %%ZOPEBASEDIR%%/ZServer/medusa/mime_type_table.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/async_mysql.py
-%%ZOPEBASEDIR%%/ZServer/medusa/misc/recorder.py
-%%ZOPEBASEDIR%%/ZServer/medusa/misc/syncsock.py
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/async_mysql.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/misc/recorder.py
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/recorder.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/misc/syncsock.py
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/syncsock.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/monitor.py
 %%ZOPEBASEDIR%%/ZServer/medusa/monitor.pyc
@@ -127,51 +107,70 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/notes/debugging.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/notes/threads.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/notes/tkinter.txt
+%%ZOPEBASEDIR%%/ZServer/medusa/out
 %%ZOPEBASEDIR%%/ZServer/medusa/producers.py
 %%ZOPEBASEDIR%%/ZServer/medusa/producers.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/resolver.py
 %%ZOPEBASEDIR%%/ZServer/medusa/resolver.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.py
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.py
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/form.mpy
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/persistent.py
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/start_demo.py
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/today.mpy
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/persistent.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/start_demo.py
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/start_demo.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/today.mpy
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/README
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/asynchat_sendfile.py
+%%ZOPEBASEDIR%%/ZServer/medusa/sendfile/asynchat_sendfile.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/sendfilemodule.c
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/test_sendfile.py
-%%ZOPEBASEDIR%%/ZServer/medusa/sendfile/asynchat_sendfile.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/test_sendfile.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.py
+%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/status_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/status_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/test/tests.txt
-%%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/__init__.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/__init__.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/tests.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/__init__.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/pi_module.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/select_trigger.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/test_module.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_channel.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/__init__.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/pi_module.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/pi_module.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/select_trigger.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/select_trigger.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/test_module.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/test_module.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_channel.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_channel.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.pyc
 %%ZOPEBASEDIR%%/doc/CHANGES.txt
 %%ZOPEBASEDIR%%/doc/CREDITS.txt
 %%ZOPEBASEDIR%%/doc/DEBUGGING.txt
@@ -223,18 +222,18 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Setup
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Xaq.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Xaq.pyc
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/release.notes.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/ExtensionClass.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Installation.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/MultiMapping.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/index.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Acquisition.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Acquisition.stx
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/ExtensionClass.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/ExtensionClass.stx
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Installation
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Installation.html
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/MultiMapping.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/MultiMapping.stx
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/index.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/index.stx
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/release.notes
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/release.notes.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/setup.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/setup.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Acquisition.c
@@ -249,18 +248,18 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/ThreadLock.c
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Xaq.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Xaq.pyc
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_explicit_acquisition
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_method_hook
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_AqAlg
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_MultiMapping
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_Sync
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_ThreadLock
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_acquisition
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_add
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_binding
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_AqAlg
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.py
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_explicit_acquisition
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_method_hook
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/regrtest.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/regrtest.pyc
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_MultiMapping.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_MultiMapping.pyc
@@ -289,9 +288,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.fl
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.sh
 %%ZOPEBASEDIR%%/lib/Components/zlib/Setup
-%%ZOPEBASEDIR%%/lib/Components/zlib/inffixed.h
-%%ZOPEBASEDIR%%/lib/Components/zlib/maketree.c
-%%ZOPEBASEDIR%%/lib/Components/zlib/trees.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/adler32.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/compress.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/crc32.c
@@ -304,12 +300,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/zlib/infcodes.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/inffast.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/inffast.h
+%%ZOPEBASEDIR%%/lib/Components/zlib/inffixed.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/inflate.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/inftrees.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/inftrees.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/infutil.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/infutil.h
+%%ZOPEBASEDIR%%/lib/Components/zlib/maketree.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/trees.c
+%%ZOPEBASEDIR%%/lib/Components/zlib/trees.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/uncompr.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/zconf.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/zlib.c
@@ -366,6 +365,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/owner.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/permissionEdit.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/roleEdit.dtml
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurity.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurity.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/www/AccessControl_icon.gif
@@ -418,9 +419,9 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/dtml/cacheParameters.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/copyright.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/cpContents.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/davLockManager.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/dbMain.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/debug.dtml
-%%ZOPEBASEDIR%%/lib/python/App/dtml/davLockManager.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/distributionView.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editFactory.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editPermission.dtml
@@ -583,24 +584,24 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/release.fl
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/release.sh
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sedscript
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/results.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/results.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/dealers.dtml
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/dealers.out
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/testDTML.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/testDTML.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/ts_regex.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/ts_regex.pyc
 %%ZOPEBASEDIR%%/lib/python/ExtensionClass.so
 %%ZOPEBASEDIR%%/lib/python/Globals.py
 %%ZOPEBASEDIR%%/lib/python/Globals.pyc
@@ -775,8 +776,10 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/OFS/rPickle.py
 %%ZOPEBASEDIR%%/lib/python/OFS/rPickle.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/framework.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/www/ControlPanel_icon.gif
 %%ZOPEBASEDIR%%/lib/python/OFS/www/Help_icon.gif
@@ -810,9 +813,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/ExternalMethod.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www/function.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.py
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/README.txt
@@ -969,12 +969,12 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-in.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-let.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-math.stx
-%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-random.stx
-%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sequence.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-mime.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-raise.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-random.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-return.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sendmail.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sequence.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqlgroup.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqltest.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqlvar.stx
@@ -993,63 +993,63 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/dtmlmethod.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/version.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/version.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/addKeywordIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/manageKeywordIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/help/KeywordIndex_searchResults.stx
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/addFieldIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/manageFieldIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/help/FieldIndex_searchResults.stx
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help/placeholder.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/addPathIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/managePathIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/help/PathIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/addFieldIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/manageFieldIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/help/FieldIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/addKeywordIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/manageKeywordIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/help/KeywordIndex_searchResults.stx
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.txt
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/addPathIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/managePathIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/help/PathIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/README.txt
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/ISO_8859_1_Splitter.so
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre.in
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Setup
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/sedscript
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/config.c
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Splitter.so
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src/Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/sedscript
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/ISO_8859_1_Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre.in
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Setup
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/ZopeSplitter.so
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/sedscript
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/config.c
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Splitter.so
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/sedscript
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src/ZopeSplitter.c
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/addTextIndex.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/addVocabulary.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/manageTextIndex.dtml
@@ -1057,36 +1057,36 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/manage_vocab.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/vocab_query.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/help/TextIndex_searchResults.stx
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests/testSplitter.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests/testSplitter.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/randid.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/randid.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/PluggableIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/ResultList.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/UnIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/randid.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/PluggableIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/ResultList.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/ResultList.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/UnIndex.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/UnIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/randid.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/randid.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help/placeholder.txt
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/framework.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/www/index.gif
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/CHANGES.txt
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/Extensions/RemotePS.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/Extensions/RemotePS.pyc
@@ -1109,6 +1109,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/module_access_examples.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/standard.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/standard.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/big_boolean.ps
@@ -1232,16 +1234,20 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/ZCatalog_MetaData-Table.stx
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/ZCatalog_Parameters.stx
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/ZCatalog_Status.stx
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/keywords.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/keywords.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/loadmail.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/loadmail.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalogTiming.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalogTiming.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www/Vocabulary.gif
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www/ZCatalog.gif
@@ -1372,56 +1378,56 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Record.so
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/__init__.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/.cvsignore
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/GlobbingLexicon.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/GlobbingLexicon.pyc
@@ -1455,6 +1461,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/sedscript
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testSplitter.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testSplitter.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testUnKeywordIndex.py
@@ -1605,14 +1613,19 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.py
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.pyc
 %%ZOPEBASEDIR%%/lib/python/Sync.so
+%%ZOPEBASEDIR%%/lib/python/Testing/README.txt
+%%ZOPEBASEDIR%%/lib/python/Testing/ZODButil.py
+%%ZOPEBASEDIR%%/lib/python/Testing/ZODButil.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Testing/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Testing/common.py
+%%ZOPEBASEDIR%%/lib/python/Testing/common.pyc
+%%ZOPEBASEDIR%%/lib/python/Testing/custom_zodb.py
+%%ZOPEBASEDIR%%/lib/python/Testing/custom_zodb.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/dispatcher.py
 %%ZOPEBASEDIR%%/lib/python/Testing/dispatcher.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/makerequest.py
 %%ZOPEBASEDIR%%/lib/python/Testing/makerequest.pyc
-%%ZOPEBASEDIR%%/lib/python/Testing/unittest.py
-%%ZOPEBASEDIR%%/lib/python/Testing/unittest.pyc
 %%ZOPEBASEDIR%%/lib/python/ThreadLock.so
 %%ZOPEBASEDIR%%/lib/python/ThreadedAsync.py
 %%ZOPEBASEDIR%%/lib/python/ThreadedAsync.pyc
@@ -1723,39 +1736,39 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/referencesf.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/referencesf.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/sedscript
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/BasicStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/BasicStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.pyc
@@ -1771,12 +1784,12 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Client.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Converters.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Converters.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRequest.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRequest.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.pyc
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.py
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Request.py
@@ -1787,13 +1800,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Test.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/cgi_hotfix.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/cgi_hotfix.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/mapply.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/mapply.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.pyc
@@ -1810,8 +1825,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/tempfile.pyc
 %%ZOPEBASEDIR%%/lib/python/ts_regex.py
 %%ZOPEBASEDIR%%/lib/python/ts_regex.pyc
-%%ZOPEBASEDIR%%/lib/python/unittest.py
-%%ZOPEBASEDIR%%/lib/python/unittest.pyc
 %%ZOPEBASEDIR%%/lib/python/version.txt
 %%ZOPEBASEDIR%%/lib/python/webdav/Collection.py
 %%ZOPEBASEDIR%%/lib/python/webdav/Collection.pyc
@@ -1838,9 +1851,9 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/webdav/dtml/locknullmain.dtml
 %%ZOPEBASEDIR%%/lib/python/webdav/hookable_PUT.py
 %%ZOPEBASEDIR%%/lib/python/webdav/hookable_PUT.pyc
+%%ZOPEBASEDIR%%/lib/python/webdav/www/davlock.gif
 %%ZOPEBASEDIR%%/lib/python/webdav/xmltools.py
 %%ZOPEBASEDIR%%/lib/python/webdav/xmltools.pyc
-%%ZOPEBASEDIR%%/lib/python/webdav/www/davlock.gif
 %%ZOPEBASEDIR%%/lib/python/xmlrpclib.py
 %%ZOPEBASEDIR%%/lib/python/xmlrpclib.pyc
 %%ZOPEBASEDIR%%/lib/python/zLOG.py
@@ -1973,6 +1986,7 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZGadflyDA
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog
@@ -1994,7 +2008,6 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src
@@ -2024,7 +2037,6 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MIMETools
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/dtml
diff --git a/www/zope210/Makefile b/www/zope210/Makefile
index 903b9af286cc..9b7eca1e4070 100644
--- a/www/zope210/Makefile
+++ b/www/zope210/Makefile
@@ -6,14 +6,12 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTVERSION=	2.4.1
+PORTREVISION=	0
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix_2001-08-04/
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
-DISTFILES=	${DISTNAME}.tgz \
-		Hotfix_2001_08_04.tgz
+DISTFILES=	${DISTNAME}.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
@@ -64,7 +62,7 @@ do-install:
 	@${ECHO} "===>   Please be patient, some builds need their time."
 	@${ECHO} "===>   Copying..."
 	@${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/
-	@${CP} -Rp ${WRKDIR}/lib ${ZOPEBASEDIR}/
+	#@${CP} -Rp ${WRKDIR}/lib ${ZOPEBASEDIR}/
 	@#
 	@${CHMOD} -R u+w ${ZOPEBASEDIR}
 	@(cd ${ZOPEBASEDIR} && ${PYTHON_CMD} w_pcgi.py)
diff --git a/www/zope210/distinfo b/www/zope210/distinfo
index b8a73d1a5fc4..88fc8fe24753 100644
--- a/www/zope210/distinfo
+++ b/www/zope210/distinfo
@@ -1,2 +1 @@
-MD5 (zope/Zope-2.4.0-src.tgz) = 1a41e096a80411bccf61cd862bc3cc20
-MD5 (zope/Hotfix_2001_08_04.tgz) = c060bf5f1a22b6d93ea3314cae9ea0cc
+MD5 (zope/Zope-2.4.1-src.tgz) = 9bb93c8431118f39310a255aa6f09609
diff --git a/www/zope210/pkg-plist b/www/zope210/pkg-plist
index 52e83f3abee0..42421e73db7b 100644
--- a/www/zope210/pkg-plist
+++ b/www/zope210/pkg-plist
@@ -37,50 +37,23 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/ZService.pyc
 %%ZOPEBASEDIR%%/ZServer/__init__.py
 %%ZOPEBASEDIR%%/ZServer/__init__.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/__init__.py
-%%ZOPEBASEDIR%%/ZServer/medusa/__init__.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.py
-%%ZOPEBASEDIR%%/ZServer/medusa/fifo.py
-%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.py
-%%ZOPEBASEDIR%%/ZServer/medusa/out
-%%ZOPEBASEDIR%%/ZServer/medusa/medusa.html
-%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/ANNOUNCE.txt
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.py
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.py
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.py
-%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/ANNOUNCE_970922.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/INSTALL.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/Makefile
-%%ZOPEBASEDIR%%/ZServer/medusa/asyncore.py.old
+%%ZOPEBASEDIR%%/ZServer/medusa/__init__.py
+%%ZOPEBASEDIR%%/ZServer/medusa/__init__.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.py
+%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/auth_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/chat_server.py
-%%ZOPEBASEDIR%%/ZServer/medusa/continuation.py
 %%ZOPEBASEDIR%%/ZServer/medusa/auth_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/chat_server.py
 %%ZOPEBASEDIR%%/ZServer/medusa/chat_server.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/continuation.py
 %%ZOPEBASEDIR%%/ZServer/medusa/continuation.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/fifo.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.py
-%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/contrib/bobo_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/contrib/sample_cgi.py
 %%ZOPEBASEDIR%%/ZServer/medusa/contrib/bobo_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/contrib/sample_cgi.py
 %%ZOPEBASEDIR%%/ZServer/medusa/contrib/sample_cgi.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/counter.py
 %%ZOPEBASEDIR%%/ZServer/medusa/counter.pyc
@@ -95,10 +68,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/docs/data_flow.html
 %%ZOPEBASEDIR%%/ZServer/medusa/docs/producers.gif
 %%ZOPEBASEDIR%%/ZServer/medusa/docs/proxy_notes.txt
+%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.py
+%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/fifo.py
+%%ZOPEBASEDIR%%/ZServer/medusa/fifo.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/filesys.py
 %%ZOPEBASEDIR%%/ZServer/medusa/filesys.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/ftp_server.py
 %%ZOPEBASEDIR%%/ZServer/medusa/ftp_server.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.py
+%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/http_date.py
 %%ZOPEBASEDIR%%/ZServer/medusa/http_date.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/http_server.py
@@ -107,15 +86,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/logger.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/m_syslog.py
 %%ZOPEBASEDIR%%/ZServer/medusa/m_syslog.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/medusa.html
 %%ZOPEBASEDIR%%/ZServer/medusa/medusa_gif.py
 %%ZOPEBASEDIR%%/ZServer/medusa/medusa_gif.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/mime_type_table.py
 %%ZOPEBASEDIR%%/ZServer/medusa/mime_type_table.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/async_mysql.py
-%%ZOPEBASEDIR%%/ZServer/medusa/misc/recorder.py
-%%ZOPEBASEDIR%%/ZServer/medusa/misc/syncsock.py
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/async_mysql.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/misc/recorder.py
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/recorder.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/misc/syncsock.py
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/syncsock.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/monitor.py
 %%ZOPEBASEDIR%%/ZServer/medusa/monitor.pyc
@@ -127,51 +107,70 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/notes/debugging.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/notes/threads.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/notes/tkinter.txt
+%%ZOPEBASEDIR%%/ZServer/medusa/out
 %%ZOPEBASEDIR%%/ZServer/medusa/producers.py
 %%ZOPEBASEDIR%%/ZServer/medusa/producers.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/resolver.py
 %%ZOPEBASEDIR%%/ZServer/medusa/resolver.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.py
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.py
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/form.mpy
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/persistent.py
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/start_demo.py
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/today.mpy
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/persistent.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/start_demo.py
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/start_demo.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/today.mpy
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/README
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/asynchat_sendfile.py
+%%ZOPEBASEDIR%%/ZServer/medusa/sendfile/asynchat_sendfile.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/sendfilemodule.c
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/test_sendfile.py
-%%ZOPEBASEDIR%%/ZServer/medusa/sendfile/asynchat_sendfile.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/test_sendfile.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.py
+%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/status_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/status_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/test/tests.txt
-%%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/__init__.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/__init__.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/tests.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/__init__.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/pi_module.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/select_trigger.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/test_module.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_channel.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/__init__.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/pi_module.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/pi_module.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/select_trigger.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/select_trigger.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/test_module.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/test_module.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_channel.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_channel.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.pyc
 %%ZOPEBASEDIR%%/doc/CHANGES.txt
 %%ZOPEBASEDIR%%/doc/CREDITS.txt
 %%ZOPEBASEDIR%%/doc/DEBUGGING.txt
@@ -223,18 +222,18 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Setup
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Xaq.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Xaq.pyc
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/release.notes.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/ExtensionClass.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Installation.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/MultiMapping.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/index.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Acquisition.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Acquisition.stx
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/ExtensionClass.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/ExtensionClass.stx
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Installation
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Installation.html
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/MultiMapping.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/MultiMapping.stx
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/index.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/index.stx
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/release.notes
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/release.notes.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/setup.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/setup.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Acquisition.c
@@ -249,18 +248,18 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/ThreadLock.c
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Xaq.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Xaq.pyc
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_explicit_acquisition
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_method_hook
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_AqAlg
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_MultiMapping
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_Sync
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_ThreadLock
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_acquisition
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_add
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_binding
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_AqAlg
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.py
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_explicit_acquisition
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_method_hook
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/regrtest.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/regrtest.pyc
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_MultiMapping.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_MultiMapping.pyc
@@ -289,9 +288,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.fl
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.sh
 %%ZOPEBASEDIR%%/lib/Components/zlib/Setup
-%%ZOPEBASEDIR%%/lib/Components/zlib/inffixed.h
-%%ZOPEBASEDIR%%/lib/Components/zlib/maketree.c
-%%ZOPEBASEDIR%%/lib/Components/zlib/trees.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/adler32.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/compress.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/crc32.c
@@ -304,12 +300,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/zlib/infcodes.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/inffast.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/inffast.h
+%%ZOPEBASEDIR%%/lib/Components/zlib/inffixed.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/inflate.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/inftrees.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/inftrees.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/infutil.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/infutil.h
+%%ZOPEBASEDIR%%/lib/Components/zlib/maketree.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/trees.c
+%%ZOPEBASEDIR%%/lib/Components/zlib/trees.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/uncompr.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/zconf.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/zlib.c
@@ -366,6 +365,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/owner.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/permissionEdit.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/roleEdit.dtml
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurity.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurity.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/www/AccessControl_icon.gif
@@ -418,9 +419,9 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/dtml/cacheParameters.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/copyright.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/cpContents.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/davLockManager.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/dbMain.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/debug.dtml
-%%ZOPEBASEDIR%%/lib/python/App/dtml/davLockManager.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/distributionView.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editFactory.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editPermission.dtml
@@ -583,24 +584,24 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/release.fl
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/release.sh
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sedscript
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/results.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/results.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/dealers.dtml
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/dealers.out
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/testDTML.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/testDTML.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/ts_regex.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/ts_regex.pyc
 %%ZOPEBASEDIR%%/lib/python/ExtensionClass.so
 %%ZOPEBASEDIR%%/lib/python/Globals.py
 %%ZOPEBASEDIR%%/lib/python/Globals.pyc
@@ -775,8 +776,10 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/OFS/rPickle.py
 %%ZOPEBASEDIR%%/lib/python/OFS/rPickle.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/framework.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/www/ControlPanel_icon.gif
 %%ZOPEBASEDIR%%/lib/python/OFS/www/Help_icon.gif
@@ -810,9 +813,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/ExternalMethod.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www/function.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.py
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/README.txt
@@ -969,12 +969,12 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-in.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-let.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-math.stx
-%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-random.stx
-%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sequence.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-mime.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-raise.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-random.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-return.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sendmail.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sequence.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqlgroup.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqltest.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqlvar.stx
@@ -993,63 +993,63 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/dtmlmethod.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/version.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/version.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/addKeywordIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/manageKeywordIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/help/KeywordIndex_searchResults.stx
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/addFieldIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/manageFieldIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/help/FieldIndex_searchResults.stx
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help/placeholder.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/addPathIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/managePathIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/help/PathIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/addFieldIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/manageFieldIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/help/FieldIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/addKeywordIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/manageKeywordIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/help/KeywordIndex_searchResults.stx
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.txt
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/addPathIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/managePathIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/help/PathIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/README.txt
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/ISO_8859_1_Splitter.so
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre.in
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Setup
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/sedscript
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/config.c
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Splitter.so
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src/Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/sedscript
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/ISO_8859_1_Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre.in
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Setup
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/ZopeSplitter.so
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/sedscript
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/config.c
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Splitter.so
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/sedscript
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src/ZopeSplitter.c
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/addTextIndex.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/addVocabulary.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/manageTextIndex.dtml
@@ -1057,36 +1057,36 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/manage_vocab.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/vocab_query.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/help/TextIndex_searchResults.stx
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests/testSplitter.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests/testSplitter.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/randid.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/randid.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/PluggableIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/ResultList.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/UnIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/randid.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/PluggableIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/ResultList.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/ResultList.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/UnIndex.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/UnIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/randid.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/randid.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help/placeholder.txt
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/framework.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/www/index.gif
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/CHANGES.txt
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/Extensions/RemotePS.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/Extensions/RemotePS.pyc
@@ -1109,6 +1109,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/module_access_examples.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/standard.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/standard.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/big_boolean.ps
@@ -1232,16 +1234,20 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/ZCatalog_MetaData-Table.stx
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/ZCatalog_Parameters.stx
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/ZCatalog_Status.stx
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/keywords.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/keywords.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/loadmail.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/loadmail.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalogTiming.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalogTiming.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www/Vocabulary.gif
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www/ZCatalog.gif
@@ -1372,56 +1378,56 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Record.so
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/__init__.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/.cvsignore
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/GlobbingLexicon.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/GlobbingLexicon.pyc
@@ -1455,6 +1461,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/sedscript
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testSplitter.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testSplitter.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testUnKeywordIndex.py
@@ -1605,14 +1613,19 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.py
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.pyc
 %%ZOPEBASEDIR%%/lib/python/Sync.so
+%%ZOPEBASEDIR%%/lib/python/Testing/README.txt
+%%ZOPEBASEDIR%%/lib/python/Testing/ZODButil.py
+%%ZOPEBASEDIR%%/lib/python/Testing/ZODButil.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Testing/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Testing/common.py
+%%ZOPEBASEDIR%%/lib/python/Testing/common.pyc
+%%ZOPEBASEDIR%%/lib/python/Testing/custom_zodb.py
+%%ZOPEBASEDIR%%/lib/python/Testing/custom_zodb.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/dispatcher.py
 %%ZOPEBASEDIR%%/lib/python/Testing/dispatcher.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/makerequest.py
 %%ZOPEBASEDIR%%/lib/python/Testing/makerequest.pyc
-%%ZOPEBASEDIR%%/lib/python/Testing/unittest.py
-%%ZOPEBASEDIR%%/lib/python/Testing/unittest.pyc
 %%ZOPEBASEDIR%%/lib/python/ThreadLock.so
 %%ZOPEBASEDIR%%/lib/python/ThreadedAsync.py
 %%ZOPEBASEDIR%%/lib/python/ThreadedAsync.pyc
@@ -1723,39 +1736,39 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/referencesf.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/referencesf.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/sedscript
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/BasicStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/BasicStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.pyc
@@ -1771,12 +1784,12 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Client.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Converters.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Converters.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRequest.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRequest.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.pyc
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.py
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Request.py
@@ -1787,13 +1800,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Test.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/cgi_hotfix.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/cgi_hotfix.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/mapply.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/mapply.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.pyc
@@ -1810,8 +1825,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/tempfile.pyc
 %%ZOPEBASEDIR%%/lib/python/ts_regex.py
 %%ZOPEBASEDIR%%/lib/python/ts_regex.pyc
-%%ZOPEBASEDIR%%/lib/python/unittest.py
-%%ZOPEBASEDIR%%/lib/python/unittest.pyc
 %%ZOPEBASEDIR%%/lib/python/version.txt
 %%ZOPEBASEDIR%%/lib/python/webdav/Collection.py
 %%ZOPEBASEDIR%%/lib/python/webdav/Collection.pyc
@@ -1838,9 +1851,9 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/webdav/dtml/locknullmain.dtml
 %%ZOPEBASEDIR%%/lib/python/webdav/hookable_PUT.py
 %%ZOPEBASEDIR%%/lib/python/webdav/hookable_PUT.pyc
+%%ZOPEBASEDIR%%/lib/python/webdav/www/davlock.gif
 %%ZOPEBASEDIR%%/lib/python/webdav/xmltools.py
 %%ZOPEBASEDIR%%/lib/python/webdav/xmltools.pyc
-%%ZOPEBASEDIR%%/lib/python/webdav/www/davlock.gif
 %%ZOPEBASEDIR%%/lib/python/xmlrpclib.py
 %%ZOPEBASEDIR%%/lib/python/xmlrpclib.pyc
 %%ZOPEBASEDIR%%/lib/python/zLOG.py
@@ -1973,6 +1986,7 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZGadflyDA
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog
@@ -1994,7 +2008,6 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src
@@ -2024,7 +2037,6 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MIMETools
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/dtml
diff --git a/www/zope211/Makefile b/www/zope211/Makefile
index 903b9af286cc..9b7eca1e4070 100644
--- a/www/zope211/Makefile
+++ b/www/zope211/Makefile
@@ -6,14 +6,12 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTVERSION=	2.4.1
+PORTREVISION=	0
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix_2001-08-04/
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
-DISTFILES=	${DISTNAME}.tgz \
-		Hotfix_2001_08_04.tgz
+DISTFILES=	${DISTNAME}.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
@@ -64,7 +62,7 @@ do-install:
 	@${ECHO} "===>   Please be patient, some builds need their time."
 	@${ECHO} "===>   Copying..."
 	@${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/
-	@${CP} -Rp ${WRKDIR}/lib ${ZOPEBASEDIR}/
+	#@${CP} -Rp ${WRKDIR}/lib ${ZOPEBASEDIR}/
 	@#
 	@${CHMOD} -R u+w ${ZOPEBASEDIR}
 	@(cd ${ZOPEBASEDIR} && ${PYTHON_CMD} w_pcgi.py)
diff --git a/www/zope211/distinfo b/www/zope211/distinfo
index b8a73d1a5fc4..88fc8fe24753 100644
--- a/www/zope211/distinfo
+++ b/www/zope211/distinfo
@@ -1,2 +1 @@
-MD5 (zope/Zope-2.4.0-src.tgz) = 1a41e096a80411bccf61cd862bc3cc20
-MD5 (zope/Hotfix_2001_08_04.tgz) = c060bf5f1a22b6d93ea3314cae9ea0cc
+MD5 (zope/Zope-2.4.1-src.tgz) = 9bb93c8431118f39310a255aa6f09609
diff --git a/www/zope211/pkg-plist b/www/zope211/pkg-plist
index 52e83f3abee0..42421e73db7b 100644
--- a/www/zope211/pkg-plist
+++ b/www/zope211/pkg-plist
@@ -37,50 +37,23 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/ZService.pyc
 %%ZOPEBASEDIR%%/ZServer/__init__.py
 %%ZOPEBASEDIR%%/ZServer/__init__.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/__init__.py
-%%ZOPEBASEDIR%%/ZServer/medusa/__init__.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.py
-%%ZOPEBASEDIR%%/ZServer/medusa/fifo.py
-%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.py
-%%ZOPEBASEDIR%%/ZServer/medusa/out
-%%ZOPEBASEDIR%%/ZServer/medusa/medusa.html
-%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/ANNOUNCE.txt
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.py
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.py
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.py
-%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/ANNOUNCE_970922.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/INSTALL.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/Makefile
-%%ZOPEBASEDIR%%/ZServer/medusa/asyncore.py.old
+%%ZOPEBASEDIR%%/ZServer/medusa/__init__.py
+%%ZOPEBASEDIR%%/ZServer/medusa/__init__.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.py
+%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/auth_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/chat_server.py
-%%ZOPEBASEDIR%%/ZServer/medusa/continuation.py
 %%ZOPEBASEDIR%%/ZServer/medusa/auth_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/chat_server.py
 %%ZOPEBASEDIR%%/ZServer/medusa/chat_server.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/continuation.py
 %%ZOPEBASEDIR%%/ZServer/medusa/continuation.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/fifo.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.py
-%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/contrib/bobo_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/contrib/sample_cgi.py
 %%ZOPEBASEDIR%%/ZServer/medusa/contrib/bobo_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/contrib/sample_cgi.py
 %%ZOPEBASEDIR%%/ZServer/medusa/contrib/sample_cgi.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/counter.py
 %%ZOPEBASEDIR%%/ZServer/medusa/counter.pyc
@@ -95,10 +68,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/docs/data_flow.html
 %%ZOPEBASEDIR%%/ZServer/medusa/docs/producers.gif
 %%ZOPEBASEDIR%%/ZServer/medusa/docs/proxy_notes.txt
+%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.py
+%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/fifo.py
+%%ZOPEBASEDIR%%/ZServer/medusa/fifo.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/filesys.py
 %%ZOPEBASEDIR%%/ZServer/medusa/filesys.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/ftp_server.py
 %%ZOPEBASEDIR%%/ZServer/medusa/ftp_server.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.py
+%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/http_date.py
 %%ZOPEBASEDIR%%/ZServer/medusa/http_date.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/http_server.py
@@ -107,15 +86,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/logger.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/m_syslog.py
 %%ZOPEBASEDIR%%/ZServer/medusa/m_syslog.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/medusa.html
 %%ZOPEBASEDIR%%/ZServer/medusa/medusa_gif.py
 %%ZOPEBASEDIR%%/ZServer/medusa/medusa_gif.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/mime_type_table.py
 %%ZOPEBASEDIR%%/ZServer/medusa/mime_type_table.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/async_mysql.py
-%%ZOPEBASEDIR%%/ZServer/medusa/misc/recorder.py
-%%ZOPEBASEDIR%%/ZServer/medusa/misc/syncsock.py
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/async_mysql.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/misc/recorder.py
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/recorder.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/misc/syncsock.py
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/syncsock.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/monitor.py
 %%ZOPEBASEDIR%%/ZServer/medusa/monitor.pyc
@@ -127,51 +107,70 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/notes/debugging.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/notes/threads.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/notes/tkinter.txt
+%%ZOPEBASEDIR%%/ZServer/medusa/out
 %%ZOPEBASEDIR%%/ZServer/medusa/producers.py
 %%ZOPEBASEDIR%%/ZServer/medusa/producers.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/resolver.py
 %%ZOPEBASEDIR%%/ZServer/medusa/resolver.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.py
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.py
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/form.mpy
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/persistent.py
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/start_demo.py
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/today.mpy
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/persistent.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/start_demo.py
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/start_demo.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/today.mpy
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/README
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/asynchat_sendfile.py
+%%ZOPEBASEDIR%%/ZServer/medusa/sendfile/asynchat_sendfile.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/sendfilemodule.c
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/test_sendfile.py
-%%ZOPEBASEDIR%%/ZServer/medusa/sendfile/asynchat_sendfile.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/test_sendfile.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.py
+%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/status_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/status_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/test/tests.txt
-%%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/__init__.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/__init__.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/tests.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/__init__.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/pi_module.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/select_trigger.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/test_module.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_channel.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/__init__.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/pi_module.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/pi_module.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/select_trigger.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/select_trigger.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/test_module.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/test_module.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_channel.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_channel.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.pyc
 %%ZOPEBASEDIR%%/doc/CHANGES.txt
 %%ZOPEBASEDIR%%/doc/CREDITS.txt
 %%ZOPEBASEDIR%%/doc/DEBUGGING.txt
@@ -223,18 +222,18 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Setup
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Xaq.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Xaq.pyc
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/release.notes.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/ExtensionClass.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Installation.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/MultiMapping.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/index.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Acquisition.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Acquisition.stx
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/ExtensionClass.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/ExtensionClass.stx
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Installation
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Installation.html
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/MultiMapping.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/MultiMapping.stx
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/index.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/index.stx
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/release.notes
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/release.notes.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/setup.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/setup.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Acquisition.c
@@ -249,18 +248,18 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/ThreadLock.c
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Xaq.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Xaq.pyc
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_explicit_acquisition
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_method_hook
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_AqAlg
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_MultiMapping
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_Sync
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_ThreadLock
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_acquisition
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_add
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_binding
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_AqAlg
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.py
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_explicit_acquisition
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_method_hook
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/regrtest.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/regrtest.pyc
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_MultiMapping.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_MultiMapping.pyc
@@ -289,9 +288,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.fl
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.sh
 %%ZOPEBASEDIR%%/lib/Components/zlib/Setup
-%%ZOPEBASEDIR%%/lib/Components/zlib/inffixed.h
-%%ZOPEBASEDIR%%/lib/Components/zlib/maketree.c
-%%ZOPEBASEDIR%%/lib/Components/zlib/trees.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/adler32.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/compress.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/crc32.c
@@ -304,12 +300,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/zlib/infcodes.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/inffast.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/inffast.h
+%%ZOPEBASEDIR%%/lib/Components/zlib/inffixed.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/inflate.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/inftrees.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/inftrees.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/infutil.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/infutil.h
+%%ZOPEBASEDIR%%/lib/Components/zlib/maketree.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/trees.c
+%%ZOPEBASEDIR%%/lib/Components/zlib/trees.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/uncompr.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/zconf.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/zlib.c
@@ -366,6 +365,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/owner.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/permissionEdit.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/roleEdit.dtml
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurity.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurity.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/www/AccessControl_icon.gif
@@ -418,9 +419,9 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/dtml/cacheParameters.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/copyright.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/cpContents.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/davLockManager.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/dbMain.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/debug.dtml
-%%ZOPEBASEDIR%%/lib/python/App/dtml/davLockManager.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/distributionView.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editFactory.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editPermission.dtml
@@ -583,24 +584,24 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/release.fl
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/release.sh
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sedscript
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/results.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/results.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/dealers.dtml
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/dealers.out
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/testDTML.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/testDTML.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/ts_regex.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/ts_regex.pyc
 %%ZOPEBASEDIR%%/lib/python/ExtensionClass.so
 %%ZOPEBASEDIR%%/lib/python/Globals.py
 %%ZOPEBASEDIR%%/lib/python/Globals.pyc
@@ -775,8 +776,10 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/OFS/rPickle.py
 %%ZOPEBASEDIR%%/lib/python/OFS/rPickle.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/framework.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/www/ControlPanel_icon.gif
 %%ZOPEBASEDIR%%/lib/python/OFS/www/Help_icon.gif
@@ -810,9 +813,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/ExternalMethod.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www/function.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.py
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/README.txt
@@ -969,12 +969,12 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-in.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-let.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-math.stx
-%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-random.stx
-%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sequence.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-mime.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-raise.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-random.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-return.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sendmail.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sequence.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqlgroup.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqltest.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqlvar.stx
@@ -993,63 +993,63 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/dtmlmethod.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/version.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/version.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/addKeywordIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/manageKeywordIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/help/KeywordIndex_searchResults.stx
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/addFieldIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/manageFieldIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/help/FieldIndex_searchResults.stx
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help/placeholder.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/addPathIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/managePathIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/help/PathIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/addFieldIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/manageFieldIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/help/FieldIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/addKeywordIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/manageKeywordIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/help/KeywordIndex_searchResults.stx
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.txt
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/addPathIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/managePathIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/help/PathIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/README.txt
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/ISO_8859_1_Splitter.so
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre.in
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Setup
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/sedscript
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/config.c
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Splitter.so
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src/Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/sedscript
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/ISO_8859_1_Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre.in
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Setup
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/ZopeSplitter.so
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/sedscript
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/config.c
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Splitter.so
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/sedscript
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src/ZopeSplitter.c
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/addTextIndex.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/addVocabulary.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/manageTextIndex.dtml
@@ -1057,36 +1057,36 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/manage_vocab.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/vocab_query.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/help/TextIndex_searchResults.stx
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests/testSplitter.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests/testSplitter.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/randid.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/randid.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/PluggableIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/ResultList.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/UnIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/randid.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/PluggableIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/ResultList.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/ResultList.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/UnIndex.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/UnIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/randid.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/randid.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help/placeholder.txt
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/framework.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/www/index.gif
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/CHANGES.txt
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/Extensions/RemotePS.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/Extensions/RemotePS.pyc
@@ -1109,6 +1109,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/module_access_examples.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/standard.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/standard.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/big_boolean.ps
@@ -1232,16 +1234,20 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/ZCatalog_MetaData-Table.stx
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/ZCatalog_Parameters.stx
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/ZCatalog_Status.stx
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/keywords.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/keywords.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/loadmail.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/loadmail.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalogTiming.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalogTiming.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www/Vocabulary.gif
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www/ZCatalog.gif
@@ -1372,56 +1378,56 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Record.so
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/__init__.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/.cvsignore
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/GlobbingLexicon.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/GlobbingLexicon.pyc
@@ -1455,6 +1461,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/sedscript
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testSplitter.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testSplitter.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testUnKeywordIndex.py
@@ -1605,14 +1613,19 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.py
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.pyc
 %%ZOPEBASEDIR%%/lib/python/Sync.so
+%%ZOPEBASEDIR%%/lib/python/Testing/README.txt
+%%ZOPEBASEDIR%%/lib/python/Testing/ZODButil.py
+%%ZOPEBASEDIR%%/lib/python/Testing/ZODButil.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Testing/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Testing/common.py
+%%ZOPEBASEDIR%%/lib/python/Testing/common.pyc
+%%ZOPEBASEDIR%%/lib/python/Testing/custom_zodb.py
+%%ZOPEBASEDIR%%/lib/python/Testing/custom_zodb.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/dispatcher.py
 %%ZOPEBASEDIR%%/lib/python/Testing/dispatcher.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/makerequest.py
 %%ZOPEBASEDIR%%/lib/python/Testing/makerequest.pyc
-%%ZOPEBASEDIR%%/lib/python/Testing/unittest.py
-%%ZOPEBASEDIR%%/lib/python/Testing/unittest.pyc
 %%ZOPEBASEDIR%%/lib/python/ThreadLock.so
 %%ZOPEBASEDIR%%/lib/python/ThreadedAsync.py
 %%ZOPEBASEDIR%%/lib/python/ThreadedAsync.pyc
@@ -1723,39 +1736,39 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/referencesf.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/referencesf.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/sedscript
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/BasicStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/BasicStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.pyc
@@ -1771,12 +1784,12 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Client.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Converters.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Converters.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRequest.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRequest.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.pyc
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.py
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Request.py
@@ -1787,13 +1800,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Test.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/cgi_hotfix.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/cgi_hotfix.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/mapply.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/mapply.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.pyc
@@ -1810,8 +1825,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/tempfile.pyc
 %%ZOPEBASEDIR%%/lib/python/ts_regex.py
 %%ZOPEBASEDIR%%/lib/python/ts_regex.pyc
-%%ZOPEBASEDIR%%/lib/python/unittest.py
-%%ZOPEBASEDIR%%/lib/python/unittest.pyc
 %%ZOPEBASEDIR%%/lib/python/version.txt
 %%ZOPEBASEDIR%%/lib/python/webdav/Collection.py
 %%ZOPEBASEDIR%%/lib/python/webdav/Collection.pyc
@@ -1838,9 +1851,9 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/webdav/dtml/locknullmain.dtml
 %%ZOPEBASEDIR%%/lib/python/webdav/hookable_PUT.py
 %%ZOPEBASEDIR%%/lib/python/webdav/hookable_PUT.pyc
+%%ZOPEBASEDIR%%/lib/python/webdav/www/davlock.gif
 %%ZOPEBASEDIR%%/lib/python/webdav/xmltools.py
 %%ZOPEBASEDIR%%/lib/python/webdav/xmltools.pyc
-%%ZOPEBASEDIR%%/lib/python/webdav/www/davlock.gif
 %%ZOPEBASEDIR%%/lib/python/xmlrpclib.py
 %%ZOPEBASEDIR%%/lib/python/xmlrpclib.pyc
 %%ZOPEBASEDIR%%/lib/python/zLOG.py
@@ -1973,6 +1986,7 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZGadflyDA
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog
@@ -1994,7 +2008,6 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src
@@ -2024,7 +2037,6 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MIMETools
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/dtml
diff --git a/www/zope213/Makefile b/www/zope213/Makefile
index 903b9af286cc..9b7eca1e4070 100644
--- a/www/zope213/Makefile
+++ b/www/zope213/Makefile
@@ -6,14 +6,12 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTVERSION=	2.4.1
+PORTREVISION=	0
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix_2001-08-04/
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
-DISTFILES=	${DISTNAME}.tgz \
-		Hotfix_2001_08_04.tgz
+DISTFILES=	${DISTNAME}.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
@@ -64,7 +62,7 @@ do-install:
 	@${ECHO} "===>   Please be patient, some builds need their time."
 	@${ECHO} "===>   Copying..."
 	@${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/
-	@${CP} -Rp ${WRKDIR}/lib ${ZOPEBASEDIR}/
+	#@${CP} -Rp ${WRKDIR}/lib ${ZOPEBASEDIR}/
 	@#
 	@${CHMOD} -R u+w ${ZOPEBASEDIR}
 	@(cd ${ZOPEBASEDIR} && ${PYTHON_CMD} w_pcgi.py)
diff --git a/www/zope213/distinfo b/www/zope213/distinfo
index b8a73d1a5fc4..88fc8fe24753 100644
--- a/www/zope213/distinfo
+++ b/www/zope213/distinfo
@@ -1,2 +1 @@
-MD5 (zope/Zope-2.4.0-src.tgz) = 1a41e096a80411bccf61cd862bc3cc20
-MD5 (zope/Hotfix_2001_08_04.tgz) = c060bf5f1a22b6d93ea3314cae9ea0cc
+MD5 (zope/Zope-2.4.1-src.tgz) = 9bb93c8431118f39310a255aa6f09609
diff --git a/www/zope213/pkg-plist b/www/zope213/pkg-plist
index 52e83f3abee0..42421e73db7b 100644
--- a/www/zope213/pkg-plist
+++ b/www/zope213/pkg-plist
@@ -37,50 +37,23 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/ZService.pyc
 %%ZOPEBASEDIR%%/ZServer/__init__.py
 %%ZOPEBASEDIR%%/ZServer/__init__.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/__init__.py
-%%ZOPEBASEDIR%%/ZServer/medusa/__init__.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.py
-%%ZOPEBASEDIR%%/ZServer/medusa/fifo.py
-%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.py
-%%ZOPEBASEDIR%%/ZServer/medusa/out
-%%ZOPEBASEDIR%%/ZServer/medusa/medusa.html
-%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/ANNOUNCE.txt
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.py
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.py
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.py
-%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/ANNOUNCE_970922.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/INSTALL.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/Makefile
-%%ZOPEBASEDIR%%/ZServer/medusa/asyncore.py.old
+%%ZOPEBASEDIR%%/ZServer/medusa/__init__.py
+%%ZOPEBASEDIR%%/ZServer/medusa/__init__.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.py
+%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/auth_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/chat_server.py
-%%ZOPEBASEDIR%%/ZServer/medusa/continuation.py
 %%ZOPEBASEDIR%%/ZServer/medusa/auth_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/chat_server.py
 %%ZOPEBASEDIR%%/ZServer/medusa/chat_server.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/continuation.py
 %%ZOPEBASEDIR%%/ZServer/medusa/continuation.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/fifo.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.py
-%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/contrib/bobo_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/contrib/sample_cgi.py
 %%ZOPEBASEDIR%%/ZServer/medusa/contrib/bobo_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/contrib/sample_cgi.py
 %%ZOPEBASEDIR%%/ZServer/medusa/contrib/sample_cgi.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/counter.py
 %%ZOPEBASEDIR%%/ZServer/medusa/counter.pyc
@@ -95,10 +68,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/docs/data_flow.html
 %%ZOPEBASEDIR%%/ZServer/medusa/docs/producers.gif
 %%ZOPEBASEDIR%%/ZServer/medusa/docs/proxy_notes.txt
+%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.py
+%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/fifo.py
+%%ZOPEBASEDIR%%/ZServer/medusa/fifo.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/filesys.py
 %%ZOPEBASEDIR%%/ZServer/medusa/filesys.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/ftp_server.py
 %%ZOPEBASEDIR%%/ZServer/medusa/ftp_server.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.py
+%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/http_date.py
 %%ZOPEBASEDIR%%/ZServer/medusa/http_date.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/http_server.py
@@ -107,15 +86,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/logger.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/m_syslog.py
 %%ZOPEBASEDIR%%/ZServer/medusa/m_syslog.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/medusa.html
 %%ZOPEBASEDIR%%/ZServer/medusa/medusa_gif.py
 %%ZOPEBASEDIR%%/ZServer/medusa/medusa_gif.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/mime_type_table.py
 %%ZOPEBASEDIR%%/ZServer/medusa/mime_type_table.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/async_mysql.py
-%%ZOPEBASEDIR%%/ZServer/medusa/misc/recorder.py
-%%ZOPEBASEDIR%%/ZServer/medusa/misc/syncsock.py
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/async_mysql.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/misc/recorder.py
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/recorder.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/misc/syncsock.py
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/syncsock.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/monitor.py
 %%ZOPEBASEDIR%%/ZServer/medusa/monitor.pyc
@@ -127,51 +107,70 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/notes/debugging.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/notes/threads.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/notes/tkinter.txt
+%%ZOPEBASEDIR%%/ZServer/medusa/out
 %%ZOPEBASEDIR%%/ZServer/medusa/producers.py
 %%ZOPEBASEDIR%%/ZServer/medusa/producers.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/resolver.py
 %%ZOPEBASEDIR%%/ZServer/medusa/resolver.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.py
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.py
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/form.mpy
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/persistent.py
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/start_demo.py
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/today.mpy
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/persistent.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/start_demo.py
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/start_demo.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/today.mpy
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/README
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/asynchat_sendfile.py
+%%ZOPEBASEDIR%%/ZServer/medusa/sendfile/asynchat_sendfile.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/sendfilemodule.c
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/test_sendfile.py
-%%ZOPEBASEDIR%%/ZServer/medusa/sendfile/asynchat_sendfile.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/test_sendfile.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.py
+%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/status_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/status_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/test/tests.txt
-%%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/__init__.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/__init__.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/tests.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/__init__.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/pi_module.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/select_trigger.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/test_module.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_channel.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/__init__.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/pi_module.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/pi_module.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/select_trigger.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/select_trigger.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/test_module.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/test_module.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_channel.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_channel.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.pyc
 %%ZOPEBASEDIR%%/doc/CHANGES.txt
 %%ZOPEBASEDIR%%/doc/CREDITS.txt
 %%ZOPEBASEDIR%%/doc/DEBUGGING.txt
@@ -223,18 +222,18 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Setup
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Xaq.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Xaq.pyc
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/release.notes.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/ExtensionClass.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Installation.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/MultiMapping.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/index.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Acquisition.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Acquisition.stx
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/ExtensionClass.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/ExtensionClass.stx
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Installation
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Installation.html
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/MultiMapping.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/MultiMapping.stx
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/index.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/index.stx
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/release.notes
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/release.notes.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/setup.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/setup.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Acquisition.c
@@ -249,18 +248,18 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/ThreadLock.c
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Xaq.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Xaq.pyc
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_explicit_acquisition
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_method_hook
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_AqAlg
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_MultiMapping
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_Sync
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_ThreadLock
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_acquisition
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_add
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_binding
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_AqAlg
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.py
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_explicit_acquisition
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_method_hook
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/regrtest.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/regrtest.pyc
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_MultiMapping.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_MultiMapping.pyc
@@ -289,9 +288,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.fl
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.sh
 %%ZOPEBASEDIR%%/lib/Components/zlib/Setup
-%%ZOPEBASEDIR%%/lib/Components/zlib/inffixed.h
-%%ZOPEBASEDIR%%/lib/Components/zlib/maketree.c
-%%ZOPEBASEDIR%%/lib/Components/zlib/trees.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/adler32.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/compress.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/crc32.c
@@ -304,12 +300,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/zlib/infcodes.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/inffast.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/inffast.h
+%%ZOPEBASEDIR%%/lib/Components/zlib/inffixed.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/inflate.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/inftrees.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/inftrees.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/infutil.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/infutil.h
+%%ZOPEBASEDIR%%/lib/Components/zlib/maketree.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/trees.c
+%%ZOPEBASEDIR%%/lib/Components/zlib/trees.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/uncompr.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/zconf.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/zlib.c
@@ -366,6 +365,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/owner.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/permissionEdit.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/roleEdit.dtml
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurity.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurity.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/www/AccessControl_icon.gif
@@ -418,9 +419,9 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/dtml/cacheParameters.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/copyright.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/cpContents.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/davLockManager.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/dbMain.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/debug.dtml
-%%ZOPEBASEDIR%%/lib/python/App/dtml/davLockManager.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/distributionView.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editFactory.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editPermission.dtml
@@ -583,24 +584,24 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/release.fl
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/release.sh
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sedscript
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/results.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/results.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/dealers.dtml
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/dealers.out
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/testDTML.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/testDTML.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/ts_regex.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/ts_regex.pyc
 %%ZOPEBASEDIR%%/lib/python/ExtensionClass.so
 %%ZOPEBASEDIR%%/lib/python/Globals.py
 %%ZOPEBASEDIR%%/lib/python/Globals.pyc
@@ -775,8 +776,10 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/OFS/rPickle.py
 %%ZOPEBASEDIR%%/lib/python/OFS/rPickle.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/framework.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/www/ControlPanel_icon.gif
 %%ZOPEBASEDIR%%/lib/python/OFS/www/Help_icon.gif
@@ -810,9 +813,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/ExternalMethod.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www/function.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.py
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/README.txt
@@ -969,12 +969,12 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-in.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-let.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-math.stx
-%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-random.stx
-%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sequence.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-mime.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-raise.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-random.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-return.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sendmail.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sequence.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqlgroup.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqltest.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqlvar.stx
@@ -993,63 +993,63 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/dtmlmethod.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/version.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/version.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/addKeywordIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/manageKeywordIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/help/KeywordIndex_searchResults.stx
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/addFieldIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/manageFieldIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/help/FieldIndex_searchResults.stx
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help/placeholder.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/addPathIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/managePathIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/help/PathIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/addFieldIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/manageFieldIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/help/FieldIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/addKeywordIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/manageKeywordIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/help/KeywordIndex_searchResults.stx
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.txt
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/addPathIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/managePathIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/help/PathIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/README.txt
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/ISO_8859_1_Splitter.so
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre.in
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Setup
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/sedscript
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/config.c
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Splitter.so
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src/Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/sedscript
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/ISO_8859_1_Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre.in
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Setup
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/ZopeSplitter.so
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/sedscript
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/config.c
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Splitter.so
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/sedscript
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src/ZopeSplitter.c
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/addTextIndex.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/addVocabulary.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/manageTextIndex.dtml
@@ -1057,36 +1057,36 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/manage_vocab.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/vocab_query.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/help/TextIndex_searchResults.stx
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests/testSplitter.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests/testSplitter.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/randid.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/randid.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/PluggableIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/ResultList.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/UnIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/randid.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/PluggableIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/ResultList.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/ResultList.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/UnIndex.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/UnIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/randid.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/randid.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help/placeholder.txt
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/framework.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/www/index.gif
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/CHANGES.txt
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/Extensions/RemotePS.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/Extensions/RemotePS.pyc
@@ -1109,6 +1109,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/module_access_examples.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/standard.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/standard.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/big_boolean.ps
@@ -1232,16 +1234,20 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/ZCatalog_MetaData-Table.stx
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/ZCatalog_Parameters.stx
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/ZCatalog_Status.stx
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/keywords.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/keywords.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/loadmail.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/loadmail.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalogTiming.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalogTiming.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www/Vocabulary.gif
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www/ZCatalog.gif
@@ -1372,56 +1378,56 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Record.so
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/__init__.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/.cvsignore
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/GlobbingLexicon.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/GlobbingLexicon.pyc
@@ -1455,6 +1461,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/sedscript
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testSplitter.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testSplitter.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testUnKeywordIndex.py
@@ -1605,14 +1613,19 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.py
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.pyc
 %%ZOPEBASEDIR%%/lib/python/Sync.so
+%%ZOPEBASEDIR%%/lib/python/Testing/README.txt
+%%ZOPEBASEDIR%%/lib/python/Testing/ZODButil.py
+%%ZOPEBASEDIR%%/lib/python/Testing/ZODButil.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Testing/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Testing/common.py
+%%ZOPEBASEDIR%%/lib/python/Testing/common.pyc
+%%ZOPEBASEDIR%%/lib/python/Testing/custom_zodb.py
+%%ZOPEBASEDIR%%/lib/python/Testing/custom_zodb.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/dispatcher.py
 %%ZOPEBASEDIR%%/lib/python/Testing/dispatcher.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/makerequest.py
 %%ZOPEBASEDIR%%/lib/python/Testing/makerequest.pyc
-%%ZOPEBASEDIR%%/lib/python/Testing/unittest.py
-%%ZOPEBASEDIR%%/lib/python/Testing/unittest.pyc
 %%ZOPEBASEDIR%%/lib/python/ThreadLock.so
 %%ZOPEBASEDIR%%/lib/python/ThreadedAsync.py
 %%ZOPEBASEDIR%%/lib/python/ThreadedAsync.pyc
@@ -1723,39 +1736,39 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/referencesf.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/referencesf.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/sedscript
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/BasicStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/BasicStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.pyc
@@ -1771,12 +1784,12 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Client.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Converters.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Converters.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRequest.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRequest.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.pyc
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.py
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Request.py
@@ -1787,13 +1800,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Test.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/cgi_hotfix.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/cgi_hotfix.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/mapply.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/mapply.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.pyc
@@ -1810,8 +1825,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/tempfile.pyc
 %%ZOPEBASEDIR%%/lib/python/ts_regex.py
 %%ZOPEBASEDIR%%/lib/python/ts_regex.pyc
-%%ZOPEBASEDIR%%/lib/python/unittest.py
-%%ZOPEBASEDIR%%/lib/python/unittest.pyc
 %%ZOPEBASEDIR%%/lib/python/version.txt
 %%ZOPEBASEDIR%%/lib/python/webdav/Collection.py
 %%ZOPEBASEDIR%%/lib/python/webdav/Collection.pyc
@@ -1838,9 +1851,9 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/webdav/dtml/locknullmain.dtml
 %%ZOPEBASEDIR%%/lib/python/webdav/hookable_PUT.py
 %%ZOPEBASEDIR%%/lib/python/webdav/hookable_PUT.pyc
+%%ZOPEBASEDIR%%/lib/python/webdav/www/davlock.gif
 %%ZOPEBASEDIR%%/lib/python/webdav/xmltools.py
 %%ZOPEBASEDIR%%/lib/python/webdav/xmltools.pyc
-%%ZOPEBASEDIR%%/lib/python/webdav/www/davlock.gif
 %%ZOPEBASEDIR%%/lib/python/xmlrpclib.py
 %%ZOPEBASEDIR%%/lib/python/xmlrpclib.pyc
 %%ZOPEBASEDIR%%/lib/python/zLOG.py
@@ -1973,6 +1986,7 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZGadflyDA
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog
@@ -1994,7 +2008,6 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src
@@ -2024,7 +2037,6 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MIMETools
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/dtml
diff --git a/www/zope28/Makefile b/www/zope28/Makefile
index 903b9af286cc..9b7eca1e4070 100644
--- a/www/zope28/Makefile
+++ b/www/zope28/Makefile
@@ -6,14 +6,12 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTVERSION=	2.4.1
+PORTREVISION=	0
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix_2001-08-04/
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
-DISTFILES=	${DISTNAME}.tgz \
-		Hotfix_2001_08_04.tgz
+DISTFILES=	${DISTNAME}.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
@@ -64,7 +62,7 @@ do-install:
 	@${ECHO} "===>   Please be patient, some builds need their time."
 	@${ECHO} "===>   Copying..."
 	@${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/
-	@${CP} -Rp ${WRKDIR}/lib ${ZOPEBASEDIR}/
+	#@${CP} -Rp ${WRKDIR}/lib ${ZOPEBASEDIR}/
 	@#
 	@${CHMOD} -R u+w ${ZOPEBASEDIR}
 	@(cd ${ZOPEBASEDIR} && ${PYTHON_CMD} w_pcgi.py)
diff --git a/www/zope28/distinfo b/www/zope28/distinfo
index b8a73d1a5fc4..88fc8fe24753 100644
--- a/www/zope28/distinfo
+++ b/www/zope28/distinfo
@@ -1,2 +1 @@
-MD5 (zope/Zope-2.4.0-src.tgz) = 1a41e096a80411bccf61cd862bc3cc20
-MD5 (zope/Hotfix_2001_08_04.tgz) = c060bf5f1a22b6d93ea3314cae9ea0cc
+MD5 (zope/Zope-2.4.1-src.tgz) = 9bb93c8431118f39310a255aa6f09609
diff --git a/www/zope28/pkg-plist b/www/zope28/pkg-plist
index 52e83f3abee0..42421e73db7b 100644
--- a/www/zope28/pkg-plist
+++ b/www/zope28/pkg-plist
@@ -37,50 +37,23 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/ZService.pyc
 %%ZOPEBASEDIR%%/ZServer/__init__.py
 %%ZOPEBASEDIR%%/ZServer/__init__.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/__init__.py
-%%ZOPEBASEDIR%%/ZServer/medusa/__init__.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.py
-%%ZOPEBASEDIR%%/ZServer/medusa/fifo.py
-%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.py
-%%ZOPEBASEDIR%%/ZServer/medusa/out
-%%ZOPEBASEDIR%%/ZServer/medusa/medusa.html
-%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/ANNOUNCE.txt
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.py
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.py
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.py
-%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/ANNOUNCE_970922.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/INSTALL.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/Makefile
-%%ZOPEBASEDIR%%/ZServer/medusa/asyncore.py.old
+%%ZOPEBASEDIR%%/ZServer/medusa/__init__.py
+%%ZOPEBASEDIR%%/ZServer/medusa/__init__.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.py
+%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/auth_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/chat_server.py
-%%ZOPEBASEDIR%%/ZServer/medusa/continuation.py
 %%ZOPEBASEDIR%%/ZServer/medusa/auth_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/chat_server.py
 %%ZOPEBASEDIR%%/ZServer/medusa/chat_server.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/continuation.py
 %%ZOPEBASEDIR%%/ZServer/medusa/continuation.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/fifo.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.py
-%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/contrib/bobo_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/contrib/sample_cgi.py
 %%ZOPEBASEDIR%%/ZServer/medusa/contrib/bobo_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/contrib/sample_cgi.py
 %%ZOPEBASEDIR%%/ZServer/medusa/contrib/sample_cgi.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/counter.py
 %%ZOPEBASEDIR%%/ZServer/medusa/counter.pyc
@@ -95,10 +68,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/docs/data_flow.html
 %%ZOPEBASEDIR%%/ZServer/medusa/docs/producers.gif
 %%ZOPEBASEDIR%%/ZServer/medusa/docs/proxy_notes.txt
+%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.py
+%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/fifo.py
+%%ZOPEBASEDIR%%/ZServer/medusa/fifo.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/filesys.py
 %%ZOPEBASEDIR%%/ZServer/medusa/filesys.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/ftp_server.py
 %%ZOPEBASEDIR%%/ZServer/medusa/ftp_server.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.py
+%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/http_date.py
 %%ZOPEBASEDIR%%/ZServer/medusa/http_date.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/http_server.py
@@ -107,15 +86,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/logger.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/m_syslog.py
 %%ZOPEBASEDIR%%/ZServer/medusa/m_syslog.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/medusa.html
 %%ZOPEBASEDIR%%/ZServer/medusa/medusa_gif.py
 %%ZOPEBASEDIR%%/ZServer/medusa/medusa_gif.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/mime_type_table.py
 %%ZOPEBASEDIR%%/ZServer/medusa/mime_type_table.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/async_mysql.py
-%%ZOPEBASEDIR%%/ZServer/medusa/misc/recorder.py
-%%ZOPEBASEDIR%%/ZServer/medusa/misc/syncsock.py
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/async_mysql.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/misc/recorder.py
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/recorder.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/misc/syncsock.py
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/syncsock.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/monitor.py
 %%ZOPEBASEDIR%%/ZServer/medusa/monitor.pyc
@@ -127,51 +107,70 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/notes/debugging.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/notes/threads.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/notes/tkinter.txt
+%%ZOPEBASEDIR%%/ZServer/medusa/out
 %%ZOPEBASEDIR%%/ZServer/medusa/producers.py
 %%ZOPEBASEDIR%%/ZServer/medusa/producers.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/resolver.py
 %%ZOPEBASEDIR%%/ZServer/medusa/resolver.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.py
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.py
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/form.mpy
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/persistent.py
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/start_demo.py
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/today.mpy
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/persistent.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/start_demo.py
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/start_demo.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/today.mpy
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/README
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/asynchat_sendfile.py
+%%ZOPEBASEDIR%%/ZServer/medusa/sendfile/asynchat_sendfile.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/sendfilemodule.c
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/test_sendfile.py
-%%ZOPEBASEDIR%%/ZServer/medusa/sendfile/asynchat_sendfile.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/test_sendfile.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.py
+%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/status_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/status_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/test/tests.txt
-%%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/__init__.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/__init__.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/tests.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/__init__.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/pi_module.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/select_trigger.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/test_module.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_channel.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/__init__.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/pi_module.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/pi_module.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/select_trigger.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/select_trigger.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/test_module.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/test_module.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_channel.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_channel.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.pyc
 %%ZOPEBASEDIR%%/doc/CHANGES.txt
 %%ZOPEBASEDIR%%/doc/CREDITS.txt
 %%ZOPEBASEDIR%%/doc/DEBUGGING.txt
@@ -223,18 +222,18 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Setup
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Xaq.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Xaq.pyc
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/release.notes.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/ExtensionClass.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Installation.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/MultiMapping.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/index.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Acquisition.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Acquisition.stx
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/ExtensionClass.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/ExtensionClass.stx
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Installation
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Installation.html
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/MultiMapping.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/MultiMapping.stx
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/index.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/index.stx
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/release.notes
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/release.notes.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/setup.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/setup.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Acquisition.c
@@ -249,18 +248,18 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/ThreadLock.c
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Xaq.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Xaq.pyc
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_explicit_acquisition
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_method_hook
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_AqAlg
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_MultiMapping
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_Sync
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_ThreadLock
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_acquisition
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_add
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_binding
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_AqAlg
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.py
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_explicit_acquisition
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_method_hook
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/regrtest.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/regrtest.pyc
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_MultiMapping.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_MultiMapping.pyc
@@ -289,9 +288,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.fl
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.sh
 %%ZOPEBASEDIR%%/lib/Components/zlib/Setup
-%%ZOPEBASEDIR%%/lib/Components/zlib/inffixed.h
-%%ZOPEBASEDIR%%/lib/Components/zlib/maketree.c
-%%ZOPEBASEDIR%%/lib/Components/zlib/trees.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/adler32.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/compress.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/crc32.c
@@ -304,12 +300,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/zlib/infcodes.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/inffast.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/inffast.h
+%%ZOPEBASEDIR%%/lib/Components/zlib/inffixed.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/inflate.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/inftrees.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/inftrees.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/infutil.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/infutil.h
+%%ZOPEBASEDIR%%/lib/Components/zlib/maketree.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/trees.c
+%%ZOPEBASEDIR%%/lib/Components/zlib/trees.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/uncompr.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/zconf.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/zlib.c
@@ -366,6 +365,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/owner.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/permissionEdit.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/roleEdit.dtml
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurity.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurity.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/www/AccessControl_icon.gif
@@ -418,9 +419,9 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/dtml/cacheParameters.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/copyright.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/cpContents.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/davLockManager.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/dbMain.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/debug.dtml
-%%ZOPEBASEDIR%%/lib/python/App/dtml/davLockManager.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/distributionView.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editFactory.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editPermission.dtml
@@ -583,24 +584,24 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/release.fl
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/release.sh
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sedscript
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/results.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/results.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/dealers.dtml
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/dealers.out
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/testDTML.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/testDTML.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/ts_regex.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/ts_regex.pyc
 %%ZOPEBASEDIR%%/lib/python/ExtensionClass.so
 %%ZOPEBASEDIR%%/lib/python/Globals.py
 %%ZOPEBASEDIR%%/lib/python/Globals.pyc
@@ -775,8 +776,10 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/OFS/rPickle.py
 %%ZOPEBASEDIR%%/lib/python/OFS/rPickle.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/framework.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/www/ControlPanel_icon.gif
 %%ZOPEBASEDIR%%/lib/python/OFS/www/Help_icon.gif
@@ -810,9 +813,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/ExternalMethod.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www/function.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.py
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/README.txt
@@ -969,12 +969,12 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-in.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-let.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-math.stx
-%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-random.stx
-%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sequence.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-mime.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-raise.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-random.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-return.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sendmail.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sequence.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqlgroup.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqltest.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqlvar.stx
@@ -993,63 +993,63 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/dtmlmethod.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/version.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/version.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/addKeywordIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/manageKeywordIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/help/KeywordIndex_searchResults.stx
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/addFieldIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/manageFieldIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/help/FieldIndex_searchResults.stx
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help/placeholder.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/addPathIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/managePathIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/help/PathIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/addFieldIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/manageFieldIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/help/FieldIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/addKeywordIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/manageKeywordIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/help/KeywordIndex_searchResults.stx
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.txt
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/addPathIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/managePathIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/help/PathIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/README.txt
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/ISO_8859_1_Splitter.so
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre.in
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Setup
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/sedscript
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/config.c
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Splitter.so
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src/Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/sedscript
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/ISO_8859_1_Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre.in
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Setup
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/ZopeSplitter.so
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/sedscript
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/config.c
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Splitter.so
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/sedscript
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src/ZopeSplitter.c
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/addTextIndex.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/addVocabulary.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/manageTextIndex.dtml
@@ -1057,36 +1057,36 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/manage_vocab.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/vocab_query.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/help/TextIndex_searchResults.stx
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests/testSplitter.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests/testSplitter.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/randid.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/randid.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/PluggableIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/ResultList.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/UnIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/randid.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/PluggableIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/ResultList.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/ResultList.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/UnIndex.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/UnIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/randid.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/randid.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help/placeholder.txt
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/framework.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/www/index.gif
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/CHANGES.txt
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/Extensions/RemotePS.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/Extensions/RemotePS.pyc
@@ -1109,6 +1109,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/module_access_examples.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/standard.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/standard.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/big_boolean.ps
@@ -1232,16 +1234,20 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/ZCatalog_MetaData-Table.stx
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/ZCatalog_Parameters.stx
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/ZCatalog_Status.stx
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/keywords.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/keywords.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/loadmail.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/loadmail.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalogTiming.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalogTiming.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www/Vocabulary.gif
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www/ZCatalog.gif
@@ -1372,56 +1378,56 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Record.so
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/__init__.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/.cvsignore
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/GlobbingLexicon.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/GlobbingLexicon.pyc
@@ -1455,6 +1461,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/sedscript
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testSplitter.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testSplitter.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testUnKeywordIndex.py
@@ -1605,14 +1613,19 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.py
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.pyc
 %%ZOPEBASEDIR%%/lib/python/Sync.so
+%%ZOPEBASEDIR%%/lib/python/Testing/README.txt
+%%ZOPEBASEDIR%%/lib/python/Testing/ZODButil.py
+%%ZOPEBASEDIR%%/lib/python/Testing/ZODButil.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Testing/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Testing/common.py
+%%ZOPEBASEDIR%%/lib/python/Testing/common.pyc
+%%ZOPEBASEDIR%%/lib/python/Testing/custom_zodb.py
+%%ZOPEBASEDIR%%/lib/python/Testing/custom_zodb.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/dispatcher.py
 %%ZOPEBASEDIR%%/lib/python/Testing/dispatcher.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/makerequest.py
 %%ZOPEBASEDIR%%/lib/python/Testing/makerequest.pyc
-%%ZOPEBASEDIR%%/lib/python/Testing/unittest.py
-%%ZOPEBASEDIR%%/lib/python/Testing/unittest.pyc
 %%ZOPEBASEDIR%%/lib/python/ThreadLock.so
 %%ZOPEBASEDIR%%/lib/python/ThreadedAsync.py
 %%ZOPEBASEDIR%%/lib/python/ThreadedAsync.pyc
@@ -1723,39 +1736,39 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/referencesf.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/referencesf.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/sedscript
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/BasicStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/BasicStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.pyc
@@ -1771,12 +1784,12 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Client.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Converters.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Converters.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRequest.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRequest.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.pyc
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.py
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Request.py
@@ -1787,13 +1800,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Test.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/cgi_hotfix.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/cgi_hotfix.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/mapply.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/mapply.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.pyc
@@ -1810,8 +1825,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/tempfile.pyc
 %%ZOPEBASEDIR%%/lib/python/ts_regex.py
 %%ZOPEBASEDIR%%/lib/python/ts_regex.pyc
-%%ZOPEBASEDIR%%/lib/python/unittest.py
-%%ZOPEBASEDIR%%/lib/python/unittest.pyc
 %%ZOPEBASEDIR%%/lib/python/version.txt
 %%ZOPEBASEDIR%%/lib/python/webdav/Collection.py
 %%ZOPEBASEDIR%%/lib/python/webdav/Collection.pyc
@@ -1838,9 +1851,9 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/webdav/dtml/locknullmain.dtml
 %%ZOPEBASEDIR%%/lib/python/webdav/hookable_PUT.py
 %%ZOPEBASEDIR%%/lib/python/webdav/hookable_PUT.pyc
+%%ZOPEBASEDIR%%/lib/python/webdav/www/davlock.gif
 %%ZOPEBASEDIR%%/lib/python/webdav/xmltools.py
 %%ZOPEBASEDIR%%/lib/python/webdav/xmltools.pyc
-%%ZOPEBASEDIR%%/lib/python/webdav/www/davlock.gif
 %%ZOPEBASEDIR%%/lib/python/xmlrpclib.py
 %%ZOPEBASEDIR%%/lib/python/xmlrpclib.pyc
 %%ZOPEBASEDIR%%/lib/python/zLOG.py
@@ -1973,6 +1986,7 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZGadflyDA
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog
@@ -1994,7 +2008,6 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src
@@ -2024,7 +2037,6 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MIMETools
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/dtml
diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index 903b9af286cc..9b7eca1e4070 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -6,14 +6,12 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTVERSION=	2.4.1
+PORTREVISION=	0
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
-		http://www.zope.org/Products/Zope/Hotfix_2001-08-04/
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
-DISTFILES=	${DISTNAME}.tgz \
-		Hotfix_2001_08_04.tgz
+DISTFILES=	${DISTNAME}.tgz
 
 MAINTAINER=	nbm@FreeBSD.org
 
@@ -64,7 +62,7 @@ do-install:
 	@${ECHO} "===>   Please be patient, some builds need their time."
 	@${ECHO} "===>   Copying..."
 	@${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/
-	@${CP} -Rp ${WRKDIR}/lib ${ZOPEBASEDIR}/
+	#@${CP} -Rp ${WRKDIR}/lib ${ZOPEBASEDIR}/
 	@#
 	@${CHMOD} -R u+w ${ZOPEBASEDIR}
 	@(cd ${ZOPEBASEDIR} && ${PYTHON_CMD} w_pcgi.py)
diff --git a/www/zope29/distinfo b/www/zope29/distinfo
index b8a73d1a5fc4..88fc8fe24753 100644
--- a/www/zope29/distinfo
+++ b/www/zope29/distinfo
@@ -1,2 +1 @@
-MD5 (zope/Zope-2.4.0-src.tgz) = 1a41e096a80411bccf61cd862bc3cc20
-MD5 (zope/Hotfix_2001_08_04.tgz) = c060bf5f1a22b6d93ea3314cae9ea0cc
+MD5 (zope/Zope-2.4.1-src.tgz) = 9bb93c8431118f39310a255aa6f09609
diff --git a/www/zope29/pkg-plist b/www/zope29/pkg-plist
index 52e83f3abee0..42421e73db7b 100644
--- a/www/zope29/pkg-plist
+++ b/www/zope29/pkg-plist
@@ -37,50 +37,23 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/ZService.pyc
 %%ZOPEBASEDIR%%/ZServer/__init__.py
 %%ZOPEBASEDIR%%/ZServer/__init__.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/__init__.py
-%%ZOPEBASEDIR%%/ZServer/medusa/__init__.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.py
-%%ZOPEBASEDIR%%/ZServer/medusa/fifo.py
-%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.py
-%%ZOPEBASEDIR%%/ZServer/medusa/out
-%%ZOPEBASEDIR%%/ZServer/medusa/medusa.html
-%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/ANNOUNCE.txt
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.py
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.py
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.py
-%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/ANNOUNCE_970922.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/INSTALL.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/Makefile
-%%ZOPEBASEDIR%%/ZServer/medusa/asyncore.py.old
+%%ZOPEBASEDIR%%/ZServer/medusa/__init__.py
+%%ZOPEBASEDIR%%/ZServer/medusa/__init__.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.py
+%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/auth_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/chat_server.py
-%%ZOPEBASEDIR%%/ZServer/medusa/continuation.py
 %%ZOPEBASEDIR%%/ZServer/medusa/auth_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/chat_server.py
 %%ZOPEBASEDIR%%/ZServer/medusa/chat_server.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/continuation.py
 %%ZOPEBASEDIR%%/ZServer/medusa/continuation.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/fifo.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.py
-%%ZOPEBASEDIR%%/ZServer/medusa/asynchat.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/contrib/bobo_handler.py
-%%ZOPEBASEDIR%%/ZServer/medusa/contrib/sample_cgi.py
 %%ZOPEBASEDIR%%/ZServer/medusa/contrib/bobo_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/contrib/sample_cgi.py
 %%ZOPEBASEDIR%%/ZServer/medusa/contrib/sample_cgi.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/counter.py
 %%ZOPEBASEDIR%%/ZServer/medusa/counter.pyc
@@ -95,10 +68,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/docs/data_flow.html
 %%ZOPEBASEDIR%%/ZServer/medusa/docs/producers.gif
 %%ZOPEBASEDIR%%/ZServer/medusa/docs/proxy_notes.txt
+%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.py
+%%ZOPEBASEDIR%%/ZServer/medusa/event_loop.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/fifo.py
+%%ZOPEBASEDIR%%/ZServer/medusa/fifo.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/filesys.py
 %%ZOPEBASEDIR%%/ZServer/medusa/filesys.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/ftp_server.py
 %%ZOPEBASEDIR%%/ZServer/medusa/ftp_server.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.py
+%%ZOPEBASEDIR%%/ZServer/medusa/http_bobo.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/http_date.py
 %%ZOPEBASEDIR%%/ZServer/medusa/http_date.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/http_server.py
@@ -107,15 +86,16 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/logger.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/m_syslog.py
 %%ZOPEBASEDIR%%/ZServer/medusa/m_syslog.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/medusa.html
 %%ZOPEBASEDIR%%/ZServer/medusa/medusa_gif.py
 %%ZOPEBASEDIR%%/ZServer/medusa/medusa_gif.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/mime_type_table.py
 %%ZOPEBASEDIR%%/ZServer/medusa/mime_type_table.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/async_mysql.py
-%%ZOPEBASEDIR%%/ZServer/medusa/misc/recorder.py
-%%ZOPEBASEDIR%%/ZServer/medusa/misc/syncsock.py
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/async_mysql.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/misc/recorder.py
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/recorder.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/misc/syncsock.py
 %%ZOPEBASEDIR%%/ZServer/medusa/misc/syncsock.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/monitor.py
 %%ZOPEBASEDIR%%/ZServer/medusa/monitor.pyc
@@ -127,51 +107,70 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/ZServer/medusa/notes/debugging.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/notes/threads.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/notes/tkinter.txt
+%%ZOPEBASEDIR%%/ZServer/medusa/out
 %%ZOPEBASEDIR%%/ZServer/medusa/producers.py
 %%ZOPEBASEDIR%%/ZServer/medusa/producers.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/put_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/redirecting_handler.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/resolver.py
 %%ZOPEBASEDIR%%/ZServer/medusa/resolver.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.py
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_client.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.py
+%%ZOPEBASEDIR%%/ZServer/medusa/rpc_server.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/form.mpy
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/persistent.py
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/start_demo.py
-%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/today.mpy
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/persistent.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/start_demo.py
 %%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/start_demo.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/script_handler_demo/today.mpy
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/README
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/asynchat_sendfile.py
+%%ZOPEBASEDIR%%/ZServer/medusa/sendfile/asynchat_sendfile.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/sendfilemodule.c
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/test_sendfile.py
-%%ZOPEBASEDIR%%/ZServer/medusa/sendfile/asynchat_sendfile.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/sendfile/test_sendfile.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.py
+%%ZOPEBASEDIR%%/ZServer/medusa/start_medusa.pyc
 %%ZOPEBASEDIR%%/ZServer/medusa/status_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/status_handler.pyc
-%%ZOPEBASEDIR%%/ZServer/medusa/test/tests.txt
-%%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.py
-%%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/__init__.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/__init__.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/asyn_http_bench.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/max_sockets.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_11.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_lb.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_medusa.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.py
 %%ZOPEBASEDIR%%/ZServer/medusa/test/test_single_11.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/test/tests.txt
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/__init__.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/pi_module.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/select_trigger.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/test_module.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_channel.py
-%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/__init__.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/pi_module.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/pi_module.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/select_trigger.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/select_trigger.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/test_module.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/test_module.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_channel.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_channel.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_handler.py
 %%ZOPEBASEDIR%%/ZServer/medusa/thread/thread_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/unix_user_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/virtual_handler.pyc
+%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.py
+%%ZOPEBASEDIR%%/ZServer/medusa/xmlrpc_handler.pyc
 %%ZOPEBASEDIR%%/doc/CHANGES.txt
 %%ZOPEBASEDIR%%/doc/CREDITS.txt
 %%ZOPEBASEDIR%%/doc/DEBUGGING.txt
@@ -223,18 +222,18 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Setup
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Xaq.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/Xaq.pyc
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/release.notes.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/ExtensionClass.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Installation.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/MultiMapping.html
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/index.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Acquisition.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Acquisition.stx
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/ExtensionClass.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/ExtensionClass.stx
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Installation
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/Installation.html
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/MultiMapping.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/MultiMapping.stx
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/index.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/index.stx
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/release.notes
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/doc/release.notes.html
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/setup.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/setup.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Acquisition.c
@@ -249,18 +248,18 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/ThreadLock.c
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Xaq.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/src/Xaq.pyc
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_explicit_acquisition
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_method_hook
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_AqAlg
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_MultiMapping
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_Sync
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_ThreadLock
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_acquisition
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_add
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_binding
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_AqAlg
-%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.py
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_explicit_acquisition
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/output/test_method_hook
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/regrtest.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/regrtest.pyc
+%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_AqAlg.pyc
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_MultiMapping.py
 %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/test/test_MultiMapping.pyc
@@ -289,9 +288,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.fl
 %%ZOPEBASEDIR%%/lib/Components/cPickle/release.sh
 %%ZOPEBASEDIR%%/lib/Components/zlib/Setup
-%%ZOPEBASEDIR%%/lib/Components/zlib/inffixed.h
-%%ZOPEBASEDIR%%/lib/Components/zlib/maketree.c
-%%ZOPEBASEDIR%%/lib/Components/zlib/trees.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/adler32.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/compress.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/crc32.c
@@ -304,12 +300,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/Components/zlib/infcodes.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/inffast.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/inffast.h
+%%ZOPEBASEDIR%%/lib/Components/zlib/inffixed.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/inflate.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/inftrees.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/inftrees.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/infutil.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/infutil.h
+%%ZOPEBASEDIR%%/lib/Components/zlib/maketree.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/trees.c
+%%ZOPEBASEDIR%%/lib/Components/zlib/trees.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/uncompr.c
 %%ZOPEBASEDIR%%/lib/Components/zlib/zconf.h
 %%ZOPEBASEDIR%%/lib/Components/zlib/zlib.c
@@ -366,6 +365,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/owner.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/permissionEdit.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/roleEdit.dtml
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurity.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurity.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/www/AccessControl_icon.gif
@@ -418,9 +419,9 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/App/dtml/cacheParameters.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/copyright.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/cpContents.dtml
+%%ZOPEBASEDIR%%/lib/python/App/dtml/davLockManager.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/dbMain.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/debug.dtml
-%%ZOPEBASEDIR%%/lib/python/App/dtml/davLockManager.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/distributionView.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editFactory.dtml
 %%ZOPEBASEDIR%%/lib/python/App/dtml/editPermission.dtml
@@ -583,24 +584,24 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/release.fl
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/release.sh
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sedscript
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/results.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/results.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/testSequence.pyc
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.py
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/tests/ztestlib.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/SortEx.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/sequence/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/dealers.dtml
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/dealers.out
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/testDTML.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/DocumentTemplate/tests/testDTML.pyc
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/ts_regex.py
-%%ZOPEBASEDIR%%/lib/python/DocumentTemplate/ts_regex.pyc
 %%ZOPEBASEDIR%%/lib/python/ExtensionClass.so
 %%ZOPEBASEDIR%%/lib/python/Globals.py
 %%ZOPEBASEDIR%%/lib/python/Globals.pyc
@@ -775,8 +776,10 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/OFS/rPickle.py
 %%ZOPEBASEDIR%%/lib/python/OFS/rPickle.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/framework.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testRanges.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/www/ControlPanel_icon.gif
 %%ZOPEBASEDIR%%/lib/python/OFS/www/Help_icon.gif
@@ -810,9 +813,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help/ExternalMethod.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www/function.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.py
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/MIMETag.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/MIMETools/README.txt
@@ -969,12 +969,12 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-in.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-let.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-math.stx
-%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-random.stx
-%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sequence.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-mime.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-raise.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-random.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-return.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sendmail.stx
+%%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sequence.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqlgroup.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqltest.stx
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/help/dtml-sqlvar.stx
@@ -993,63 +993,63 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/dtmlmethod.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/images/version.gif
 %%ZOPEBASEDIR%%/lib/python/Products/OFSP/version.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/addKeywordIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/manageKeywordIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/help/KeywordIndex_searchResults.stx
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/addFieldIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/manageFieldIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/help/FieldIndex_searchResults.stx
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help/placeholder.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/addPathIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/managePathIndex.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/help/PathIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/addFieldIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/dtml/manageFieldIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/FieldIndex/help/FieldIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/addKeywordIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/dtml/manageKeywordIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/KeywordIndex/help/KeywordIndex_searchResults.stx
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.txt
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/PathIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/addPathIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/dtml/managePathIndex.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/PathIndex/help/PathIndex_searchResults.stx
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/README.txt
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/ISO_8859_1_Splitter.so
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre.in
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Setup
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/sedscript
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/config.c
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Splitter.so
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/Makefile
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src/Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/sedscript
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/ISO_8859_1_Splitter.c
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre.in
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Setup
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/ZopeSplitter.so
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/sedscript
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/config.c
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Splitter.so
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/sedscript
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src/ZopeSplitter.c
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/setup.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/addTextIndex.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/addVocabulary.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/manageTextIndex.dtml
@@ -1057,36 +1057,36 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/manage_vocab.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml/vocab_query.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/help/TextIndex_searchResults.stx
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests/testSplitter.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests/testSplitter.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/randid.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Lexicon.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/TextIndex.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/randid.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/PluggableIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/ResultList.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/UnIndex.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/randid.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/PluggableIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/ResultList.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/ResultList.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/UnIndex.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/UnIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/randid.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/randid.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.py
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common/util.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help/placeholder.txt
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/framework.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testFieldIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testKeywordIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testPathIndex.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testSplitter.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.py
+%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests/testTextIndex.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/www/index.gif
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/CHANGES.txt
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/Extensions/RemotePS.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/Extensions/RemotePS.pyc
@@ -1109,6 +1109,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/module_access_examples.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/standard.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/standard.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.py
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/testPythonScript.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/big_boolean.ps
@@ -1232,16 +1234,20 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/ZCatalog_MetaData-Table.stx
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/ZCatalog_Parameters.stx
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help/ZCatalog_Status.stx
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/keywords.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/keywords.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/loadmail.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/loadmail.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/keywords.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/loadmail.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalogTiming.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalogTiming.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www/Vocabulary.gif
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www/ZCatalog.gif
@@ -1372,56 +1378,56 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/Products/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Record.so
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.py
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/__init__.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/ast.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/astgen.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/consts.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/future.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/misc.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pyassem.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/pycodegen.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/symbols.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/transformer.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/compiler/visitor.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/restricted_module.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/security_in_syntax.pyc
+%%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/tests/testRestrictions.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.py
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Compilers.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Guards.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Limits.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/MutatingWalker.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/PrintCollector.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/RestrictionMutator.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/SafeMapping.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/Utilities.pyc
-%%ZOPEBASEDIR%%/lib/python/RestrictedPython/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/.cvsignore
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/GlobbingLexicon.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/GlobbingLexicon.pyc
@@ -1455,6 +1461,8 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/sedscript
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/framework.py
+%%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/framework.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testSplitter.py
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testSplitter.pyc
 %%ZOPEBASEDIR%%/lib/python/SearchIndex/tests/testUnKeywordIndex.py
@@ -1605,14 +1613,19 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.py
 %%ZOPEBASEDIR%%/lib/python/StructuredText/tests/testStructuredText.pyc
 %%ZOPEBASEDIR%%/lib/python/Sync.so
+%%ZOPEBASEDIR%%/lib/python/Testing/README.txt
+%%ZOPEBASEDIR%%/lib/python/Testing/ZODButil.py
+%%ZOPEBASEDIR%%/lib/python/Testing/ZODButil.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Testing/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Testing/common.py
+%%ZOPEBASEDIR%%/lib/python/Testing/common.pyc
+%%ZOPEBASEDIR%%/lib/python/Testing/custom_zodb.py
+%%ZOPEBASEDIR%%/lib/python/Testing/custom_zodb.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/dispatcher.py
 %%ZOPEBASEDIR%%/lib/python/Testing/dispatcher.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/makerequest.py
 %%ZOPEBASEDIR%%/lib/python/Testing/makerequest.pyc
-%%ZOPEBASEDIR%%/lib/python/Testing/unittest.py
-%%ZOPEBASEDIR%%/lib/python/Testing/unittest.pyc
 %%ZOPEBASEDIR%%/lib/python/ThreadLock.so
 %%ZOPEBASEDIR%%/lib/python/ThreadedAsync.py
 %%ZOPEBASEDIR%%/lib/python/ThreadedAsync.pyc
@@ -1723,39 +1736,39 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZODB/referencesf.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/referencesf.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/sedscript
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/BasicStorage.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/BasicStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/ConflictResolution.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/HistoryStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/IteratorStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/LocalStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/MinPO.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/PackableStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/StorageTestBase.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/Synchronization.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/TransactionalUndoVersionStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/VersionStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/speed.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testFileStorage.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testTransaction.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/tests/testZODB.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/utils.pyc
@@ -1771,12 +1784,12 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Client.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Converters.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Converters.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRequest.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRequest.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.pyc
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.py
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Request.py
@@ -1787,13 +1800,15 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/Test.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/cgi_hotfix.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/cgi_hotfix.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/mapply.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/mapply.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.pyc
@@ -1810,8 +1825,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/tempfile.pyc
 %%ZOPEBASEDIR%%/lib/python/ts_regex.py
 %%ZOPEBASEDIR%%/lib/python/ts_regex.pyc
-%%ZOPEBASEDIR%%/lib/python/unittest.py
-%%ZOPEBASEDIR%%/lib/python/unittest.pyc
 %%ZOPEBASEDIR%%/lib/python/version.txt
 %%ZOPEBASEDIR%%/lib/python/webdav/Collection.py
 %%ZOPEBASEDIR%%/lib/python/webdav/Collection.pyc
@@ -1838,9 +1851,9 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/webdav/dtml/locknullmain.dtml
 %%ZOPEBASEDIR%%/lib/python/webdav/hookable_PUT.py
 %%ZOPEBASEDIR%%/lib/python/webdav/hookable_PUT.pyc
+%%ZOPEBASEDIR%%/lib/python/webdav/www/davlock.gif
 %%ZOPEBASEDIR%%/lib/python/webdav/xmltools.py
 %%ZOPEBASEDIR%%/lib/python/webdav/xmltools.pyc
-%%ZOPEBASEDIR%%/lib/python/webdav/www/davlock.gif
 %%ZOPEBASEDIR%%/lib/python/xmlrpclib.py
 %%ZOPEBASEDIR%%/lib/python/xmlrpclib.pyc
 %%ZOPEBASEDIR%%/lib/python/zLOG.py
@@ -1973,6 +1986,7 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZGadflyDA
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog
@@ -1994,7 +2008,6 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/common
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src
@@ -2024,7 +2037,6 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MailHost
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/MIMETools
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2001_08_04
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/dtml