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

[Pádraig Brady]

commit 029a691b9f0021fce8ca38cddaf3a62ee18deb4b
Merge: 7f20a73 2509e10
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Jan 20 17:32:56 2012 +0000

    Merge branch 'master' into el6
    
    Conflicts:
    	openstack-glance.spec

 .gitignore            |    1 +
 openstack-glance.spec |   13 ++++++-------
 sources               |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --cc openstack-glance.spec
index 48971c1,c7ba310..c2405c9
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@@ -10,9 -6,9 +6,9 @@@ Summary:          OpenStack Image Servi
  Group:            Applications/System
  License:          ASL 2.0
  URL:              http://glance.openstack.org
- Source0:          http://launchpad.net/glance/diablo/%{version}/+download/glance-%{version}%{snapshot}.tar.gz
+ Source0:          http://launchpad.net/glance/diablo/%{version}/+download/glance-%{version}.tar.gz
 -Source1:          openstack-glance-api.service
 -Source2:          openstack-glance-registry.service
 +Source1:          openstack-glance-api.init
 +Source2:          openstack-glance-registry.init
  Source3:          openstack-glance.logrotate
  
  #