Merge part of 'jc/diff'
authorJunio C Hamano <junkio@cox.net>
Thu, 2 Mar 2006 06:15:38 +0000 (22:15 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 2 Mar 2006 06:15:38 +0000 (22:15 -0800)

Trivial merge