Finish commit of Rui's change for deadlock bug.
Authored by: tswift 2009-02-21
Parent: [r6259]
Child: [r6261]