Merge branch 'master' of git://github.com/rackspace/keystone

Conflicts:
	keystone/test/functional/test_tokens.py

1 files changed, 1 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index 2c54da52..1ddf18eb 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ setup(
     entry_points={
         'paste.app_factory': ['main=identity:app_factory'],
         'paste.filter_factory': [
-            'remoteauth=keystone:remoteauth_factory',
+            'remoteauth=keystone.middleware.remoteauth:remoteauth_factory',
             'tokenauth=keystone.auth_protocols.auth_token:filter_factory',
             ],
         },