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