Comment 1 for bug 843078

I had to rebase this, but the changes have been included.

=====
As of July 27, 2011, rackspace/keystone became a fork of openstack/keystone.

This means that all keystone changes must now be made directly through gerrit for code review, and automatically handed off to jenkins for testing and integration into openstack/keystone.

To contribute your changes, follow the workflow described here: http://wiki.openstack.org/GerritWorkflow

If you need help with the new process, feel free to contact me.
=====