ff9a5bc - Add Conflicts for doc

Authored and Committed by agoode 16 years ago
1 file changed. 7 lines added. 2 lines removed.
    - Add Conflicts for doc
    - Update doc package description
    
        
file modified
+7 -2