9dd1832 Upstream update

Authored and Committed by denisarnaud 11 years ago
    Upstream update
    
        
file modified
+8 -9
file modified
+5 -2
file modified
+1 -1