1093d14 Fix 7.0.27 merge

Authored and Committed by van 12 years ago
    Fix 7.0.27 merge
    
        
file modified
+1 -1
file modified
+6 -5