60f0662 Merge from master

Merged and Committed by cfeist 11 years ago
    Merge from master
    
        
file modified
+4 -0
file modified
+7 -2
file modified
+1 -1