Merge with master changes.
commit7de94155add87f7cd8aaddbef224669e62d3302a
authorJunio C Hamano <junkio@cox.net>
Wed, 17 Aug 2005 01:49:04 +0000 (16 18:49 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 17 Aug 2005 01:49:04 +0000 (16 18:49 -0700)
treedff26a03fcb6361cef83146fc4bc7413ab4b981c
parent1f40c7c24d999675df818f9d7824937a964f9f40
parent83db04ff878f40146952ee5d3d2d113568455f5b
Merge with master changes.