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

[Devan Goodwin]

commit 2a17545a62ad6a003806ec4123b32b2b8fd71a5a
Merge: 1cdfb6f 4bc58cc
Author: Devan Goodwin <dgoodwin at rm-rf.ca>
Date:   Fri Jun 24 11:35:33 2011 -0300

    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore
    	python-rhsm.spec
    	sources

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