Merge pull request #1007 from gavinandresen/log_auto_remove