Merge pull request #505 from gavinandresen/unique_coinbase