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

[Alan Pevec]

commit 86b28d2e06f7ad9f2a8447a2eeebb2e703c99e40
Merge: 97f4c18 8562a0d
Author: Alan Pevec <apevec at redhat.com>
Date:   Sat Mar 9 11:46:12 2013 +0100

    Merge branch 'master' into el6-grizzly

 python-keystoneclient.spec |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)
---
diff --cc python-keystoneclient.spec
index 643fce1,fa9c855..37d725b
--- a/python-keystoneclient.spec
+++ b/python-keystoneclient.spec
@@@ -28,13 -26,13 +26,13 @@@ BuildRequires: python-setuptool
  
  %description
  Client library and command line utility for interacting with Openstack
- Keystone's API.
+ Identity API.
  
  %package doc
- Summary:    Documentation for OpenStack Keystone API Client
+ Summary:    Documentation for OpenStack Identity API Client
  Group:      Documentation
  
 -BuildRequires: python-sphinx
 +BuildRequires: python-sphinx10
  
  %description doc
  Documentation for the client library for interacting with Openstack