Update branch to use the exact same Zope 3 version as the trunk

setup.py

@@ -415,9 +415,6 @@ ext_modules = [
     Extension("zope.hookable._zope_hookable",
               ["zope/hookable/_zope_hookable.c"]),
 
-    Extension("zope.thread._zope_thread",
-              ["zope/thread/_zope_thread.c"]),
-
     Extension("zope.app.container._zope_app_container_contained",
               ["zope/app/container/_zope_app_container_contained.c"],
               include_dirs = [".",
@@ -523,17 +520,34 @@ setup(
     author=AUTHOR,
 
     data_files=installed_data_files,
-    scripts=["utilities/mkzeoinstance.py", "utilities/mkzopeinstance.py",
-             "utilities/check_catalog.py", "utilities/load_site.py",
-             "utilities/requestprofiler.py", "utilities/zpasswd.py",
-             "utilities/copyzopeskel.py", "utilities/reindex_catalog.py",
-             "utilities/compilezpy.py", "utilities/decompilezpy.py",
+    scripts=["utilities/mkzeoinstance.py",
+             "utilities/mkzopeinstance.py",
+             "utilities/check_catalog.py",
+             "utilities/load_site.py",
+             "utilities/requestprofiler.py",
+             "utilities/zpasswd.py",
+             "utilities/copyzopeskel.py",
+             "utilities/reindex_catalog.py",
+             "utilities/compilezpy.py",
+             "utilities/decompilezpy.py",
              "utilities/ZODBTools/analyze.py",
-             "utilities/ZODBTools/checkbtrees.py", "utilities/ZODBTools/fsdump.py",
-             "utilities/ZODBTools/fsrefs.py" , "utilities/ZODBTools/fstail.py",
-             "utilities/ZODBTools/fstest.py", "utilities/ZODBTools/migrate.py",
-             "utilities/ZODBTools/netspace.py", "utilities/ZODBTools/zodbload.py",
-             "utilities/ZODBTools/repozo.py", "utilities/ZODBTools/space.py",
+             "utilities/ZODBTools/checkbtrees.py",
+             "utilities/ZODBTools/fsdump.py",
+             "utilities/ZODBTools/fsrefs.py" ,
+             "utilities/ZODBTools/fstail.py",
+             "utilities/ZODBTools/fstest.py",
+             "utilities/ZODBTools/migrate.py",
+             "utilities/ZODBTools/netspace.py",
+             "utilities/ZODBTools/zodbload.py",
+             "utilities/ZODBTools/repozo.py",
+             "utilities/ZODBTools/space.py",
+             "lib/python/ZEO/scripts/timeout.py",
+             "lib/python/ZEO/scripts/parsezeolog.py",
+             "lib/python/ZEO/scripts/zeopack.py",
+             "lib/python/ZEO/scripts/zeoqueue.py",
+             "lib/python/ZEO/scripts/zeoreplay.py",
+             "lib/python/ZEO/scripts/zeoserverlog.py",
+             "lib/python/ZEO/scripts/zeoup.py",
              "test.py"],
     distclass=ZopeDistribution,
     )