11b4dbf update from SVN

Authored and Committed by lennart 16 years ago
    update from SVN
    
        
file modified
+8 -4
file modified
+1 -1