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

[Pádraig Brady]

commit 478caff82e9cf3be35bd49e57554e99286d02b23
Merge: 61f92b6 467ad89
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Jan 23 22:07:47 2012 +0000

    Merge branch 'master' into el6

 ...x-X-Server-Management-Url-for-v1.0-noauth.patch |   47 ++++++++++++++++++++
 openstack-nova.spec                                |    5 ++
 2 files changed, 52 insertions(+), 0 deletions(-)
---
diff --cc openstack-nova.spec
index d7fbc5a,2005ed5..531cc6f
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@@ -193,10 -192,8 +194,11 @@@ This package contains documentation fil
  %patch08 -p1
  %patch09 -p1
  %patch10 -p1
+ %patch11 -p1
  
 +# Apply EPEL patch
 +%patch100 -p1
 +
  find . \( -name .gitignore -o -name .placeholder \) -delete
  
  find nova -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;