Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Oct 2009 23:10:37 +0000 (16:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Oct 2009 23:10:37 +0000 (16:10 -0700)
* maint:
sha1_file: Fix infinite loop when pack is corrupted

Trivial merge