712f93f merge from devel

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