985b132 - Fix the conflict with man-1.6e-3.fc7

Authored and Committed by dchen 16 years ago
    - Fix the conflict with man-1.6e-3.fc7
    
        
file modified
+7 -1