Merge branch 'jc/grep'
authorJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:16:33 +0000 (19:16 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:16:33 +0000 (19:16 -0700)

Trivial merge