c7f7fc Merge branch 'f17'

Merged and Committed by Paolo Bonzini 12 years ago
    Merge branch 'f17'
    
    Conflicts:
    	qemu.spec
    
        
file modified
+17 -6
file modified
+39 -4