Merge changes from master.
authorJunio C Hamano <junkio@cox.net>
Wed, 17 Aug 2005 21:25:08 +0000 (14:25 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 17 Aug 2005 21:25:08 +0000 (14:25 -0700)

Trivial merge