Merge branch 'jc/racy-delay'
authorJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:41:44 +0000 (19:41 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:41:44 +0000 (19:41 -0700)
Trivial merge