cc60699 Upstream update

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