Code

Merge refs/heads/master from .
authorJunio C Hamano <junkio@cox.net>
Thu, 25 Aug 2005 00:50:26 +0000 (17:50 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 25 Aug 2005 00:50:26 +0000 (17:50 -0700)

Trivial merge