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

[Devan Goodwin]

commit 5bbc56ddee05a143d7cf8260b0687121ea1971ef
Merge: e41c4a3 b71a2cb
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Mon Dec 5 16:20:14 2011 -0400

    Merge branch 'master' into f14

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