Merge refs/heads/master from .
authorJunio C Hamano <junkio@cox.net>
Sun, 21 Aug 2005 20:59:38 +0000 (13:59 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 21 Aug 2005 20:59:38 +0000 (13:59 -0700)

Trivial merge