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

[Alan Pevec]

commit 61dac7de1f6f0e840a80913930f8ed4827b3039e
Merge: a4eac51 a48babb
Author: Alan Pevec <apevec at redhat.com>
Date:   Mon Dec 3 19:32:35 2012 +0100

    Merge branch 'master' into el6

 .gitignore             |    1 +
 python-novaclient.spec |    5 ++++-
 sources                |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index e899dc4,39aa3eb..9c2b480
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,9 +1,2 @@@
 -/python-novaclient-2.6.1~bzr89.tar.gz
 -/python-novaclient-2012.1~e3.tar.gz
 -/python-novaclient-2012.1~e4.tar.gz
 -/python-novaclient-2012.1~rc1.tar.gz
 -/python-novaclient-2012.1.tar.gz
 -/python-novaclient-2012.2~f1.tar.gz
 -/python-novaclient-2.8.0.26.tar.gz
  /python-novaclient-2.9.0.tar.gz
+ /python-novaclient-2.10.0.tar.gz