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

[Devan Goodwin]

commit 8615c9323c02b96577ad1325c09f5b53ad80dca1
Merge: 8548d45 5b01e5b
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Mon Jan 16 10:45:58 2012 -0400

    Merge branch 'master' into f15

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