Merge with master.
authorJunio C Hamano <junkio@cox.net>
Wed, 10 Aug 2005 17:55:54 +0000 (10:55 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 10 Aug 2005 17:55:54 +0000 (10:55 -0700)
This merges commit
ef0bd2e6e643f09a8294937caf99463328b9215a
from master into our head commit
f69714c38c6f3296a4bfba0d057e0f1605373f49

Sincerely,
jit-merge command.

Trivial merge