Merge refs/heads/master from .
authorJunio C Hamano <junkio@cox.net>
Tue, 30 Aug 2005 05:38:45 +0000 (22:38 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 30 Aug 2005 05:38:45 +0000 (22:38 -0700)

Trivial merge