Log Message: ----------- Resolve conflicts Modified Files: -------------- src/lib/libz: minigzip.c (r1.3 -> r1.4) (http://cvsweb.midnightbsd.org/src/lib/libz/minigzip.c?r1=1.3&r2=1.4)