Merge refs/heads/master from .
authorJunio C Hamano <junkio@cox.net>
Tue, 23 Aug 2005 22:32:17 +0000 (15:32 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 23 Aug 2005 22:32:17 +0000 (15:32 -0700)

Trivial merge