80144c0 update to 2.1.1

Authored and Committed by remi 9 years ago
    update to 2.1.1
    
    (cherry picked from commit d9900b68825798e0f21b116f15b0e7ca6058c189)
    
        
file modified
+2 -0
file modified
+6 -3
file modified
+1 -1