b6248fb Sync FC-5/6 from devel

Authored and Committed by orion 17 years ago
    Sync FC-5/6 from devel
    
        
file modified
+21 -4
file added
+16