[python-virtinst/f17: 3/3] Merge branch 'master' into f17

[Cole Robinson]

commit 146d81043e94b6f6abc9910210134ce404e25a70
Merge: fe7e233 6ffc00f
Author: Cole Robinson <crobinso at redhat.com>
Date:   Mon Jul 9 14:20:09 2012 -0400

    Merge branch 'master' into f17
    
    Conflicts:
    	python-virtinst.spec

 .gitignore           |    1 +
 python-virtinst.spec |   16 ++++++++--------
 sources              |    2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)
---