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

[Devan Goodwin]

commit 8548d45d5dd5e1ba0c19be686b0665a84286e860
Merge: 06306ae b71a2cb
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Mon Dec 5 16:19:58 2011 -0400

    Merge branch 'master' into f15

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