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

[Devan Goodwin]

commit 06306ae5f84b481f30b33a4c58771044a5999e3a
Merge: e914aeb dbb02d2
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Wed Aug 24 16:25:09 2011 -0300

    Merge branch 'master' into f15

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