Merge with master to pick up safety patches.
authorJunio C Hamano <junkio@cox.net>
Fri, 19 Aug 2005 05:10:50 +0000 (22:10 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 19 Aug 2005 05:10:50 +0000 (22:10 -0700)
Trivial merge