5dc5f46 Merge devel here and see if we can get a clean build on RHEL 4

Authored and Committed by plindner 16 years ago
    Merge devel here and see if we can get a clean build on RHEL 4
    
        
file modified
+10 -1
file modified
+1 -1