5bbf9b3 Update to 1.6.0, update SL patch from upstream

Authored and Committed by tmz 12 years ago
    Update to 1.6.0, update SL patch from upstream
    
        
file renamed
+50 -23
file removed
-17
file modified
+8 -6
file modified
+1 -1