Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Fri, 29 Jul 2011 12:45:54 +0000 (14:45 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Fri, 29 Jul 2011 12:45:54 +0000 (14:45 +0200)

Trivial merge