[openstack-keystone/el6] (2 commits) ...Merge branch 'f17' into el6

[Alan Pevec]

Summary of changes:

  0ac1bab... Delete user tokens after role grant/revoke (CVE-2012-4413) (*)
  f5f2194... Merge branch 'f17' into el6

(*) This commit already existed in another branch; no separate mail sent