Merge master into rc
authorJunio C Hamano <junkio@cox.net>
Sun, 14 Aug 2005 01:38:52 +0000 (18:38 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 14 Aug 2005 01:38:52 +0000 (18:38 -0700)

Trivial merge