Merge early part of branch 'jc/daemon'
authorJunio C Hamano <junkio@cox.net>
Thu, 31 Aug 2006 20:00:39 +0000 (13:00 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 31 Aug 2006 20:00:39 +0000 (13:00 -0700)

Trivial merge