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

[Devan Goodwin]

commit 3c8cb71ea880085a51e13ebdb428dffc5b14ac22
Merge: d50a068 2065900
Author: Devan Goodwin <dgoodwin at rm-rf.ca>
Date:   Fri Feb 11 09:47:54 2011 -0400

    Merge branch 'master' into el6/master

 .gitignore       |    1 +
 python-rhsm.spec |   18 ++++++++++++------
 sources          |    2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)
---