69247a7 - Fix zaptel-lib(s) conflicts

Authored and Committed by jcollie 15 years ago
    - Fix zaptel-lib(s) conflicts
    
        
file modified
+5 -2