b414e87 Merge from devel

Authored and Committed by lkundrak 14 years ago
    Merge from devel
    
        
file modified
+0 -1
file added
+1
file modified
+15 -8
file modified
+0 -1