Merge with master changes.
authorJunio C Hamano <junkio@cox.net>
Tue, 16 Aug 2005 00:02:31 +0000 (17:02 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 16 Aug 2005 00:02:31 +0000 (17:02 -0700)
Trivial merge