Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Fri, 30 Sep 2011 15:39:29 +0000 (17:39 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Fri, 30 Sep 2011 15:39:29 +0000 (17:39 +0200)

Trivial merge