Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Wed, 31 Aug 2011 15:06:38 +0000 (17:06 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Wed, 31 Aug 2011 15:06:38 +0000 (17:06 +0200)

Trivial merge