e24e0e3 Sync with 1_6-test branch.

Authored and Committed by scop 16 years ago
    Sync with 1_6-test branch.
    
        
file modified
+1 -1
file modified
+1 -1
file modified
+16 -6