Merge branch 'jc/maint-obsd46' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 26 Dec 2009 22:15:55 +0000 (14:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 26 Dec 2009 22:15:55 +0000 (14:15 -0800)
* jc/maint-obsd46:
t4019 "grep" portability fix
t1200: work around a bug in some implementations of "find"

Trivial merge