9dddd8f merge from devel

Authored and Committed by lkundrak 15 years ago
    merge from devel
    
        
file modified
+1 -1
file added
+1
file modified
+66 -16
file modified
+1 -1