507c3e1 - rebase to latest upstream version

Authored and Committed by jskala 15 years ago
    - rebase to latest upstream version
    - resolves license conflict GPLv2 -> GPLv3+ due to gnulib
    
        
file modified
+1 -2
file modified
+6 -2
file modified
+1 -1