Merge part of np/delta
authorJunio C Hamano <junkio@cox.net>
Tue, 28 Feb 2006 09:15:29 +0000 (01:15 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 28 Feb 2006 09:15:29 +0000 (01:15 -0800)

Trivial merge