5270c25 Sync with devel.

Authored and Committed by jpo 16 years ago
    Sync with devel.
    
        
file modified
+14 -4