Merge branch 'listaddresses' of https://github.com/gavinandresen/bitcoin-git
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 3 Jan 2011 19:45:49 +0000 (14:45 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 3 Jan 2011 19:45:49 +0000 (14:45 -0500)

Trivial merge