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

[Alan Pevec]

Summary of changes:

  191daee... Update to the latest stable/diablo snapshot (*)
  2ef442f... Update to 2011.13.1 stable/diablo release (*)
  7a0d673... fix changelog entry (*)
  4c31395... include LICENSE, update package description from README.md (*)
  30f7afb... Merge branch 'master' into el6

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