8a79a95 Pull from devel

Authored and Committed by lkundrak 13 years ago
    Pull from devel
    
        
file modified
+1 -1
file removed
-401
file modified
+6 -5
file added
+1
file modified
+1 -1