Merge pull request #1094 from jgarzik/already-have-locking