Merge refs/heads/master from .
authorJunio C Hamano <junkio@cox.net>
Sat, 27 Aug 2005 00:34:01 +0000 (17:34 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 27 Aug 2005 00:34:01 +0000 (17:34 -0700)

Trivial merge