567ee0 update with karstens changes

Authored and Committed by jperrin 9 years ago
    update with karstens changes
    
        
file modified
+26 -23
file modified
+2 -2