7eb4f04 resync with devel

Authored and Committed by pghmcfc 16 years ago
    resync with devel
    
        
file modified
+17 -3