560dcb2 Sync to devel.

Authored and Committed by twaugh 16 years ago
    Sync to devel.
    
        
file modified
+10 -6