git: Merge branch 'vendor/FILE'

[Peter Avalos]

commit 0e5ac7dcff4ec887765a72a010b6fffb07547e84
Merge: 3ed2fff367234c63795998a33c7c1b803b57bd03 884044a574904c56cc0441938f957625f5153d6c
Author: Peter Avalos <pavalos at dragonflybsd.org>
Date:   Sun May 15 18:08:40 2011 -1000

    Merge branch 'vendor/FILE'

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/0e5ac7dcff4ec887765a72a010b6fffb07547e84


-- 
DragonFly BSD source repository