acbcc31 Sync with devel

Authored and Committed by kwizart 16 years ago
    Sync with devel
    
        
file modified
+4 -1
file modified
+1 -1