Merge branch 'lockcontention' of https://github.com/TheBlueMatt/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 23 Jan 2012 18:15:43 +0000 (13:15 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 23 Jan 2012 18:15:43 +0000 (13:15 -0500)

Trivial merge