Module Name:	othersrc
Committed By:	lukem
Date:		Fri Jun 10 04:05:01 UTC 2005

Modified Files:
	othersrc/usr.bin/tnftp/src: cmds.c cmdtab.c complete.c extern.h fetch.c
	    ftp.c main.c progressbar.c ruserpass.c util.c

Log Message:
merge 20050610


To generate a diff of this commit:
cvs rdiff -r1.8 -r1.9 othersrc/usr.bin/tnftp/src/cmds.c \
    othersrc/usr.bin/tnftp/src/progressbar.c
cvs rdiff -r1.6 -r1.7 othersrc/usr.bin/tnftp/src/cmdtab.c \
    othersrc/usr.bin/tnftp/src/extern.h
cvs rdiff -r1.5 -r1.6 othersrc/usr.bin/tnftp/src/complete.c \
    othersrc/usr.bin/tnftp/src/ruserpass.c
cvs rdiff -r1.10 -r1.11 othersrc/usr.bin/tnftp/src/fetch.c \
    othersrc/usr.bin/tnftp/src/ftp.c othersrc/usr.bin/tnftp/src/main.c
cvs rdiff -r1.13 -r1.14 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.