8c409a2 Merge branch 'master' into f14

Merged and Committed by kwizart 13 years ago
    Merge branch 'master' into f14
    
    Conflicts:
    	libvdpau.spec
    
        
file modified
+2 -2