e6f2dd0 Merge branch 'master' into f17

Merged and Committed by crobinso 9 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	virt-manager.spec
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+30 -36