a34b15b add fix for #646079 and use upstream fix for #628742

Authored and Committed by tomspur 13 years ago
    add fix for #646079 and use upstream fix for #628742
    
        
file modified
+10 -2