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

[Devan Goodwin]

commit 1c645ee7ad0ffee279edbd3acc35a28b8929fbc1
Merge: 5ae758b 4bc58cc
Author: Devan Goodwin <dgoodwin at rm-rf.ca>
Date:   Fri Jun 24 11:34:38 2011 -0300

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

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