Merge refs/heads/master from .
authorJunio C Hamano <junkio@cox.net>
Mon, 29 Aug 2005 00:57:45 +0000 (17:57 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 29 Aug 2005 00:57:45 +0000 (17:57 -0700)

Trivial merge