d05e217 Merge branch 'f17' into f16

Merged and Committed by crobinso 9 years ago
    Merge branch 'f17' into f16
    
    Conflicts:
    	.gitignore
    	sources
    	virt-manager.spec
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+39 -42