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

Trivial merge