Merge pull request #636 from gavinandresen/master
authorGavin Andresen <gavinandresen@gmail.com>
Tue, 15 Nov 2011 21:48:12 +0000 (13:48 -0800)
committerGavin Andresen <gavinandresen@gmail.com>
Tue, 15 Nov 2011 21:48:12 +0000 (13:48 -0800)
Fix crash-on-wallet-upgrade bug on OSX


Trivial merge