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

[Devan Goodwin]

commit 859483f65d1a054d9101a3235ad087d6cc2e40b0
Merge: 549af2c 4e18180
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Thu Aug 9 12:42:25 2012 -0300

    Merge branch 'master' into f15

 .gitignore       |    1 +
 python-rhsm.spec |   87 +++++++++++++++++++++++++++++++++++++++++++++---------
 sources          |    2 +-
 3 files changed, 75 insertions(+), 15 deletions(-)
---