ed0782c Merge remote-tracking branch 'origin/master' into f16

Merged and Committed by jwrdegoede 12 years ago
1 file changed. 10 lines added. 2 lines removed.
    Merge remote-tracking branch 'origin/master' into f16
    
    Conflicts:
    	cheese.spec
    
        
file modified
+10 -2