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

[Devan Goodwin]

commit 7629631cbee9e4f825492968a6b1332f86c14efb
Merge: 2a17545 7195beb
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Wed Jul 13 14:59:32 2011 -0300

    Merge branch 'master' into f15

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