Merge branch 'deladdr' of https://github.com/sipa/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 26 Mar 2012 18:32:26 +0000 (14:32 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 26 Mar 2012 18:32:26 +0000 (14:32 -0400)

Trivial merge