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

[Devan Goodwin]

commit 549af2cad3c0ad361d014373f3dc88650b9312e5
Merge: 9c46fef c8d6dc6
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Thu Jun 28 15:23:07 2012 -0300

    Merge branch 'master' into f15

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