f12396e resync with devel

Authored and Committed by pghmcfc 17 years ago
    resync with devel
    
        
file modified
+6 -7