Merge pull request #1 from bitcoin/master

lllll
Merge remote-tracking branch 'upstream/master'
test
Merge branch 'master' of github.com:perol/bitcoin