git: Merge branch 'vendor/FILE'

[Peter Avalos]

commit 47f970a328bab4a33ac48dd00ee7bbd42421ee3a
Merge: 7544493bd138e34bca410fbbad383bb7bb7ddbfb 9f86ab308fed0018345e1f01dda2d5da2cdd1612
Author: Peter Avalos <pavalos at dragonflybsd.org>
Date:   Sat Dec 31 12:44:00 2011 -0800

    Merge branch 'vendor/FILE'

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/47f970a328bab4a33ac48dd00ee7bbd42421ee3a


-- 
DragonFly BSD source repository