9c81a64 Pull from devel

Authored and Committed by lkundrak 13 years ago
    Pull from devel
    
        
file modified
+1 -1
file modified
+7 -1
file modified
+1 -0
file modified
+1 -1