3679ef9 fix file conflict with ktorrent

Authored and Committed by than 14 years ago
    fix file conflict with ktorrent
    
        
file modified
+8 -1