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