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

[Devan Goodwin]

commit bf799a939e8ba8d5bfd5926b6a0b7919fff75b67
Merge: a984d65 28a629e
Author: Devan Goodwin <dgoodwin at rm-rf.ca>
Date:   Fri Jan 7 16:10:52 2011 -0400

    Merge branch 'master' into f14

 .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