Merge branch 'fix'
authorJunio C Hamano <junkio@cox.net>
Tue, 9 May 2006 20:54:42 +0000 (13:54 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 9 May 2006 20:54:42 +0000 (13:54 -0700)
* fix:
  read-cache.c: use xcalloc() not calloc()
  apply: fix infinite loop with multiple patches with --index


Trivial merge