Merge refs/heads/master from .
authorJunio C Hamano <junkio@cox.net>
Thu, 1 Sep 2005 08:02:39 +0000 (01:02 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 1 Sep 2005 08:02:39 +0000 (01:02 -0700)
Trivial merge