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

[Devan Goodwin]

commit e914aeb93612a5d58fc4064918aee1ce70a9a930
Merge: 7629631 60014ca
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Wed Aug 3 13:31:54 2011 -0300

    Merge branch 'master' into f15

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