6818fd2 Merge commit '7a39fd461efc36f501eab29563483cf47c1d46ec'

Merged and Committed by Rex Dieter 10 years ago
    Merge commit '7a39fd461efc36f501eab29563483cf47c1d46ec'
    
    Conflicts:
    	pulseaudio.spec
    
        
file modified
+9 -1