79f61f4 Sync with devel.

Authored and Committed by twaugh 15 years ago
    Sync with devel.
    
        
file modified
+93 -90
file modified
+13 -2