Merge branch 'master' of github.com:laanwj/bitcoin-qt
authorWladimir J. van der Laan <laanwj@gmail.com>
Fri, 10 Jun 2011 20:39:47 +0000 (22:39 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Fri, 10 Jun 2011 20:39:47 +0000 (22:39 +0200)

Trivial merge