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