98fc3d1 Revert parts of previous changes.

Authored and Committed by corsepiu 11 years ago
    Revert parts of previous changes.
    
    - Upstream update.
    
        
file modified
+1 -0
file modified
+21 -13
file modified
+1 -1