Merge master to get fixes up to 1.2.1
authorJunio C Hamano <junkio@cox.net>
Thu, 16 Feb 2006 03:45:03 +0000 (19:45 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 16 Feb 2006 03:45:03 +0000 (19:45 -0800)
1  2 
cache.h

diff --cc cache.h
Simple merge