Module Name:	basesrc
Committed By:	thorpej
Date:		Fri Nov 16 01:17:00 UTC 2001

Modified Files:
	basesrc/lib/libc/net [nathanw_sa]: getnameinfo.3 getnameinfo.c
	basesrc/lib/libc/sys [nathanw_sa]: poll.2
Added Files:
	basesrc/lib/libc/arch/mips/gen [nathanw_sa]: sf_modf.c
Removed Files:
	basesrc/lib/libc/arch/mips [nathanw_sa]: :errfix

Log Message:
Fix merge errors from last sync w/ -current.


To generate a diff of this commit:
cvs rdiff -r1.1 -r0 basesrc/lib/libc/arch/mips/:errfix
cvs rdiff -r0 -r1.3.2.1 basesrc/lib/libc/arch/mips/gen/sf_modf.c
cvs rdiff -r1.12.2.1 -r1.12.2.2 basesrc/lib/libc/net/getnameinfo.3
cvs rdiff -r1.25.2.2 -r1.25.2.3 basesrc/lib/libc/net/getnameinfo.c
cvs rdiff -r1.8.6.1 -r1.8.6.2 basesrc/lib/libc/sys/poll.2

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