a1e20fe Cherry-pick 2 patches from upstream git fixing an exotic crash (rhbz#838279)

Authored and Committed by jwrdegoede 11 years ago
    Cherry-pick 2 patches from upstream git fixing an exotic crash (rhbz#838279)
    
        
file modified
+8 -1