ba47e37 Update to upstream version 6

Authored and Committed by mizdebsk 11 years ago
    Update to upstream version 6
    
        
file modified
+1 -0
file removed
-60
file modified
+17 -36
file modified
+1 -1