Merge branch 'deadlock-fixes' of https://github.com/jgarzik/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Tue, 5 Apr 2011 23:34:06 +0000 (19:34 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Tue, 5 Apr 2011 23:34:06 +0000 (19:34 -0400)

Trivial merge