7ed95be Add latest fixes

Authored and Committed by mgrepl 11 years ago
    Add latest fixes
    
        
file modified
+92 -87
file modified
+219 -103