f1f26d1 Upstream update

Merged and Committed by denisarnaud 11 years ago
    Upstream update
    
        
file modified
+11 -9
file modified
+15 -5
file modified
+1 -1