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

[Devan Goodwin]

commit f7a3c2cdcbde64b6a6fa37d5ed1845354d37fecb
Merge: b201ea5 60014ca
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Wed Aug 3 13:32:15 2011 -0300

    Merge branch 'master' into f14

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