bcc4ac7 fix conflicts with guhnome3

Authored and Committed by Dan Mashal 11 years ago
    fix conflicts with guhnome3
    
        
file modified
+19 -23