946ed0c resync with devel

Authored and Committed by pghmcfc 16 years ago
    resync with devel
    
        
file modified
+51 -43