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

[Devan Goodwin]

commit 8b40f10e3721300aabaeddf20fd93709a8b93fa6
Merge: 83532b7 6201844
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Wed Mar 14 14:24:40 2012 -0300

    Merge branch 'master' into f15

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