bd20b02 new upstream 11.82 and fix two duplicated files

Authored and Committed by Ed Hill 18 years ago
    new upstream 11.82 and fix two duplicated files
    
        
file modified
+8 -5