merged the tseaver-persistent_as_egg branch to complete the persistent separation

buildout.cfg

@@ -7,11 +7,11 @@ versions = versions
 
 [versions]
 zc.recipe.testrunner = 1.3.0
-persistent = 4.0.0
 
 [test]
 recipe = zc.recipe.testrunner
 eggs =
+    persistent
     ZODB3 [test]
 initialization =
   import os, tempfile

setup.py

@@ -189,6 +189,10 @@ setup(name="ZODB3",
       test_suite="__main__.alltests", # to support "setup.py test"
       tests_require = ['zope.testing', manuel_version],
       extras_require = dict(test=['zope.testing', manuel_version]),
+      # XXX: We don't really want to install these headers;  we would
+      #      prefer just including them so that folks can build from an sdist.
+      headers = ['include/persistent/cPersistence.h',
+                 'include/persistent/ring.h'],
       install_requires = [
         transaction_version,
         'persistent',