6b357f7 Really fix the problems caused by previous merge

Authored and Committed by jgrulich 10 years ago
    Really fix the problems caused by previous merge
    
        
file modified
+0 -6