df13814 rebased to the latest git snapshot

Authored and Committed by Jan Zeleny 14 years ago
    rebased to the latest git snapshot
    
        
file modified
+1 -1
file modified
+5 -2
file modified
+1 -1