Merge branch 'master' of ssh://amethyst/home/orion/projects2/bitcoin/bitcoin-qt
authorWladimir J. van der Laan <laanwj@gmail.com>
Sun, 5 Jun 2011 14:11:44 +0000 (16:11 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Sun, 5 Jun 2011 14:11:44 +0000 (16:11 +0200)

Trivial merge