30c2e08 Upstream patch to fix a deadlock

Authored and Committed by ajax 10 years ago
    Upstream patch to fix a deadlock
    
        
file modified
+6 -1