Merge branch 'filesystem' of https://github.com/Diapolo/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 9 Apr 2012 14:41:59 +0000 (10:41 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 9 Apr 2012 14:41:59 +0000 (10:41 -0400)

Trivial merge