a5d9935 sync devel and F-7

Authored and Committed by simo 16 years ago
    sync devel and F-7
    
        
file modified
+1 -0
file modified
+9 -3
file modified
+1 -1