d12e4ff sync with devel

Authored and Committed by mschwendt 14 years ago
    sync with devel
    
        
file modified
+84 -32