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

[Devan Goodwin]

commit 844240fd7713ca2e79739af97efb898141d4d40a
Merge: 8b40f10 2c45d5e
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Thu Apr 5 12:13:04 2012 -0300

    Merge branch 'master' into f15

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