33442ae - update from CVS

Authored and Committed by jnovy 17 years ago
    - update from CVS
    - drop .fish-upload patch, applied upstream
    - sync .showfree patch
    
        
file modified
+54 -60
file modified
+6 -3
file modified
+1 -1