a91ccf2 Merge from devel

Authored and Committed by lkundrak 14 years ago
    Merge from devel
    
        
file modified
+1 -1
file added
+1
file modified
+16 -6
file modified
+1 -1