51bb399 add conflicts, slight description changes

Authored and Committed by spot 15 years ago
    add conflicts, slight description changes
    
        
file modified
+11 -5