Merge branch 'semaphores-v0.6.2' of https://github.com/sipa/bitcoin into 0.6.2
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 10 May 2012 20:39:49 +0000 (16:39 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 10 May 2012 20:39:49 +0000 (16:39 -0400)

Trivial merge