Merge branch 'daemon-mode' of https://github.com/tcatm/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Sun, 13 Mar 2011 21:15:34 +0000 (17:15 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Sun, 13 Mar 2011 21:15:34 +0000 (17:15 -0400)

Trivial merge