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

[Devan Goodwin]

commit b201ea50ff2cd584526a89585097a6e58cc09bdf
Merge: 1c645ee 7195beb
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Wed Jul 13 14:59:52 2011 -0300

    Merge branch 'master' into f14

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