0af5dff Merge branch 'f15' of ssh://pkgs.fedoraproject.org/xorg-x11-drv-openchrome into f15

Merged and Committed by xavierb 12 years ago
    Merge branch 'f15' of ssh://pkgs.fedoraproject.org/xorg-x11-drv-openchrome into f15
    
    Conflicts:
    	xorg-x11-drv-openchrome.spec
    
        
file modified
+3 -3