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

[Devan Goodwin]

commit d23b67af8be83f2790c8ad0f7c14bd3970f2bd3c
Merge: 5bbc56d 5b01e5b
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Mon Jan 16 10:46:09 2012 -0400

    Merge branch 'master' into f14

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