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

[Devan Goodwin]

commit 83532b70539b54f28b4532f58528a9c13cad12ce
Merge: 85be919 3e0fc99
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Wed Feb 22 12:31:24 2012 -0400

    Merge branch 'master' into f15

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