Merge early parts of 'np/delta' branch
authorJunio C Hamano <junkio@cox.net>
Thu, 2 Mar 2006 00:55:51 +0000 (16:55 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 2 Mar 2006 00:55:51 +0000 (16:55 -0800)

Trivial merge