d4eb6b8 pull in (partial?) upstream fix for deadlocks (#1193742, fdo#84252)

Authored and Committed by Rex Dieter 8 years ago
    pull in (partial?) upstream fix for deadlocks (#1193742, fdo#84252)
    
        
file modified
+8 -2