884912 update from svn

Authored and Committed by lennart 13 years ago
    update from svn
    
        
file modified
+1 -1
file modified
+7 -3
file modified
+1 -1