0f19737 F-12 branch synced with devel

Authored and Committed by kdudka 14 years ago
    F-12 branch synced with devel
    
        
file modified
+11 -6