git: Merge branch 'vendor/TNFTP'

[Peter Avalos]

commit 03aa649a49397a74c980b88acb6cd8e784b7e421
Merge: b87225f135b049909feb5edacdcfcffcefecd3ab 20e59a13da22ed730008e138d6c6e71e0c138cce
Author: Peter Avalos <pavalos at dragonflybsd.org>
Date:   Tue Dec 14 19:54:39 2010 -1000

    Merge branch 'vendor/TNFTP'

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/03aa649a49397a74c980b88acb6cd8e784b7e421


-- 
DragonFly BSD source repository