c092157 - rebase to latest upstream release

Authored and Committed by jskala 15 years ago
    - rebase to latest upstream release
    
        
file modified
+1 -1
file modified
+4 -1
file modified
+1 -1