146d810 Merge branch 'master' into f17

Merged and Committed by crobinso 11 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	python-virtinst.spec
    
        
file modified
+1 -0
file modified
+8 -8
file modified
+1 -1