git: Merge branch 'vendor/GREP'

[John Marino]

commit 9b33b2248c9d362077a8df8e7afd64f8104a8fd1
Merge: 683199bcec38256267164d6b8dd94a78df91af98 200fbe8d4864acebd870d2b49e6432d73728581d
Author: John Marino <draco at marino.st>
Date:   Sun Oct 30 01:57:46 2011 +0200

    Merge branch 'vendor/GREP'

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/9b33b2248c9d362077a8df8e7afd64f8104a8fd1


-- 
DragonFly BSD source repository