2061a73 Merge snapshot from devel

Authored and Committed by lkundrak 14 years ago
    Merge snapshot from devel
    
        
file modified
+5 -2
file modified
+1 -1