ab4cb57 - re-base to latest upstream

Authored and Committed by jskala 15 years ago
    - re-base to latest upstream
    - fixed license conflict (GPL2 -> GPLv3+) due to new gnulib
    
        
file modified
+1 -2
file modified
+6 -2
file modified
+1 -1