Merge refs/heads/master from .
authorJunio C Hamano <junkio@cox.net>
Mon, 29 Aug 2005 20:07:55 +0000 (13:07 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 29 Aug 2005 20:07:55 +0000 (13:07 -0700)

Trivial merge