Merge pull request #635 from gavinandresen/encryptionbug