Module Name:	othersrc
Committed By:	lukem
Date:		Thu Jun  7 04:00:20 UTC 2007

Modified Files:
	othersrc/usr.bin/tnftp/src: cmds.c extern.h fetch.c ftp.1 ftp.c main.c
	    util.c

Log Message:
Merge 20070605


To generate a diff of this commit:
cvs rdiff -r1.11 -r1.12 othersrc/usr.bin/tnftp/src/cmds.c
cvs rdiff -r1.8 -r1.9 othersrc/usr.bin/tnftp/src/extern.h
cvs rdiff -r1.13 -r1.14 othersrc/usr.bin/tnftp/src/fetch.c \
    othersrc/usr.bin/tnftp/src/ftp.c
cvs rdiff -r1.9 -r1.10 othersrc/usr.bin/tnftp/src/ftp.1
cvs rdiff -r1.12 -r1.13 othersrc/usr.bin/tnftp/src/main.c
cvs rdiff -r1.15 -r1.16 othersrc/usr.bin/tnftp/src/util.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.