[openstack-glance/el6: 10/10] Merge branch 'master' into el6

[Mark McLoughlin]

commit 7a0b0ea67708c756ab1d707a0bed3df600315238
Merge: 82163bb 69c951e
Author: Mark McLoughlin <markmc at redhat.com>
Date:   Mon Oct 24 11:58:15 2011 +0100

    Merge branch 'master' into el6

 openstack-glance-api.init         |  101 -------------------------------------
 openstack-glance-api.service      |   12 ++++
 openstack-glance-registry.init    |  101 -------------------------------------
 openstack-glance-registry.service |   12 ++++
 openstack-glance.spec             |   36 +++++++++----
 5 files changed, 48 insertions(+), 214 deletions(-)
---