14be60d Sync with devel.

Authored and Committed by steve 16 years ago
    Sync with devel.
    
        
file modified
+34 -27