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

[Devan Goodwin]

commit ddd2f0c6f9d7e97aa53de65c61adef02abfe43a2
Merge: 3c8cb71 8ad10a2
Author: Devan Goodwin <dgoodwin at rm-rf.ca>
Date:   Mon Feb 14 08:57:47 2011 -0400

    Merge branch 'master' into el6/master

 .gitignore       |    1 +
 python-rhsm.spec |    5 ++++-
 sources          |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---