Merge refs/heads/master from .
authorJunio C Hamano <junkio@cox.net>
Tue, 30 Aug 2005 04:51:26 +0000 (21:51 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 30 Aug 2005 04:51:26 +0000 (21:51 -0700)
Trivial merge