Merge refs/heads/master from .
authorJunio C Hamano <junkio@cox.net>
Thu, 25 Aug 2005 01:54:24 +0000 (18:54 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 25 Aug 2005 01:54:24 +0000 (18:54 -0700)
Trivial merge