7b99653 Merge from devel due to (#466145)

Authored and Committed by lkundrak 12 years ago
    Merge from devel due to (#466145)
    
        
file modified
+4 -1
file modified
+1 -1