cf871aa fix kdepim Conflicts

Authored and Committed by rdieter 13 years ago
1 file changed. 10 lines added. 4 lines removed.
    fix kdepim Conflicts
    
        
file modified
+10 -4