6d1c29b update to upstream

Authored and Committed by kaio 12 years ago
    update to upstream
    
        
file modified
+1 -0
file modified
+6 -2
file modified
+1 -1