b421a7c merge from origin/master

Merged and Committed by dtardon 10 years ago
    merge from origin/master
    
        
file modified
+6 -0
file modified
+83 -89
file modified
+3 -3