011a6e0 update from SVN

Authored and Committed by lennart 16 years ago
    update from SVN
    
        
file modified
+1 -2
file modified
+43 -38
file modified
+1 -2