Merge refs/heads/master from .
authorJunio C Hamano <junkio@cox.net>
Wed, 31 Aug 2005 06:11:12 +0000 (23:11 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 31 Aug 2005 06:11:12 +0000 (23:11 -0700)

Trivial merge