21da76a merge from master

Merged and Committed by dtardon 12 years ago
    merge from master
    
        
file modified
+26 -18