0b98a79 rebase + various changes

Authored and Committed by jgorig 13 years ago
    rebase + various changes
    
        
file modified
+1 -1
file modified
+1 -1
file modified
+190 -137
file modified
+1 -1