diff -ru --exclude='*.pyc' --exclude='*.pyo' tmp/enfold.xapian-0.9.23-py2.4.egg/enfold/xapian/store.py eggs/enfold.xapian-0.9.23-py2.4.egg/enfold/xapian/store.py
--- tmp/enfold.xapian-0.9.23-py2.4.egg/enfold/xapian/store.py	2008-08-15 17:24:59.000000000 -0400
+++ eggs/enfold.xapian-0.9.23-py2.4.egg/enfold/xapian/store.py	2008-08-15 18:52:09.000000000 -0400
@@ -721,8 +721,8 @@
         except ImportError:
             logger.exception('Could not import SignalHandler from Zope')
             return
-        SignalHandler.registerHandler(SIGTERM, self._cleanup)
-        SignalHandler.registerHandler(SIGINT, self._cleanup)
+        SignalHandler.registerHandler(SIGTERM, self.cleanup)
+        SignalHandler.registerHandler(SIGINT, self.cleanup)
         # XXX Disabled. We can't call 'close_all' here as it might
         # interfere with other threads that are still running and that
         # could cause a crash. Not sure what else we could do here,
@@ -746,10 +746,6 @@
         finally:
             self.init_lock.release()
 
-    def _cleanup(self):
-        self.cleanup()
-        raise SystemExit
-
     close = cleanup
             
     def restart(self):