b51ebd Merge branch 'master' of ssh://pkgs.fedoraproject.org/qemu

Merged and Committed by Justin M. Forbes 13 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/qemu
    
    Conflicts:
    	qemu.spec
    
        
file modified
+8 -0