Log Message: ----------- fix botched merge Modified Files: -------------- src/sys/libkern: iconv.c (r1.3 -> r1.4) (http://cvsweb.midnightbsd.org/src/sys/libkern/iconv.c?r1=1.3&r2=1.4)