e7af0bd Merge stable from devel

Authored and Committed by lkundrak 14 years ago
    Merge stable from devel
    
        
file modified
+1 -1
file modified
+1 -0
file modified
+10 -11
file modified
+1 -1