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

[Devan Goodwin]

commit 1d71d1f5b06f49a6b7bf45c6faf0a765fab7df48
Merge: d2dac2d 28a629e
Author: Devan Goodwin <dgoodwin at rm-rf.ca>
Date:   Fri Jan 7 16:12:25 2011 -0400

    Merge branch 'master' into el6

 .gitignore       |    1 +
 python-rhsm.spec |    8 +++++++-
 sources          |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 0c4ddf4,57b9863..3fa26f9
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -/python-rhsm-0.94.9.tar.gz
  /python-rhsm-0.94.10.tar.gz
+ /python-rhsm-0.94.12.tar.gz