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

[Devan Goodwin]

commit 9c46fefef2d23bf89e15fff9ecd4305e2209c897
Merge: 9c48746 de3ac6a
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Thu Jun 7 16:00:48 2012 -0300

    Merge branch 'master' into f15

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