Merge refs/heads/master from .
authorJunio C Hamano <junkio@cox.net>
Wed, 24 Aug 2005 04:30:42 +0000 (21:30 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 24 Aug 2005 04:30:42 +0000 (21:30 -0700)

Trivial merge