Merged most recent upstream/master to resolve nasty keyring bug

Refer to:
http://lists.openstack.org/pipermail/openstack-dev/2013-February/005754.html