Merge with master.
authorJunio C Hamano <junkio@cox.net>
Thu, 18 Aug 2005 22:46:07 +0000 (15:46 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 18 Aug 2005 22:46:07 +0000 (15:46 -0700)
Trivial merge