Index: branches/locker-dev/locker/deploy/trac/trac.fcgi
===================================================================
--- branches/locker-dev/locker/deploy/trac/trac.fcgi	(revision 1774)
+++ branches/locker-dev/locker/deploy/trac/trac.fcgi	(revision 1790)
@@ -2,5 +2,6 @@
 
 import os, os.path, sys
-from trac.web import fcgi_frontend
+from trac.web.main import dispatch_request
+from trac.web._fcgi import WSGIServer
 import urlparse
 
@@ -38,5 +39,5 @@
         env.log.exception(e)
     if env.needs_upgrade():
-        fcgi_frontend._fcgi.WSGIServer(send_upgrade_message).run()
+        WSGIServer(send_upgrade_message).run()
         sys.exit(0)
     if hasattr(trac.env, 'env_cache'):
@@ -65,5 +66,5 @@
                  referrer.path, referrer.query, referrer.fragment))
 
-    return fcgi_frontend.dispatch_request(environ, start_response)
+    return dispatch_request(environ, start_response)
 
-fcgi_frontend._fcgi.WSGIServer(my_dispatch_request).run()
+WSGIServer(my_dispatch_request).run()