1987121 Merge branch 'master' into f19

Merged and Committed by Rex Dieter 11 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	alsa-lib.spec
    
        
file modified
+10 -3