[openstack-keystone/el6] (5 commits) ...Merge branch 'master' into el6

[Mark McLoughlin]

Summary of changes:

  0b714a3... initial import (*)
  e972b04... add Requires: python-passlib (*)
  ddb82e0... Update version to diablo final
  b81baa5... Reduce differences against master branch to ease merging
  6738ff5... Merge branch 'master' into el6

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