[python-virtinst/f16: 13/13] Merge branch 'f17' into f16

[Cole Robinson]

commit fc7b009f3bf9b45991560061407c523fff0f2e4e
Merge: 5653f7f 146d810
Author: Cole Robinson <crobinso at redhat.com>
Date:   Mon Jul 9 14:24:32 2012 -0400

    Merge branch 'f17' into f16
    
    Conflicts:
    	.gitignore
    	python-virtinst.spec
    	sources

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