[python-keystoneclient/el6-grizzly: 2/2] Merge branch 'master' into el6-grizzly

[Jakub Ruzicka]

commit ffd30715e733520604654f8e9c59412e15f90bc7
Merge: 1133ab4 babe0b6
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date:   Thu Apr 4 19:14:43 2013 +0200

    Merge branch 'master' into el6-grizzly

 python-keystoneclient.spec |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)
---