9e4d306 Forward port update from F-12

Authored and Committed by beekhof 14 years ago
    Forward port update from F-12
    
        
file modified
+1 -0
file modified
+8 -2
file modified
+1 -0