Merge branch 'jn/test-cleanup-7006'

* jn/test-cleanup-7006: test: errors preparing for a test are not special

Junio C Hamano committed Dec 22, 2011 at 11:27 UTC c53d1e49f9b87cbfb7e53b17cd935e8c54469d6b

No changes.