Log Message: ----------- Fix merge conflict Modified Files: -------------- src/contrib/bzip2: decompress.c (r1.2 -> r1.3) (http://cvsweb.midnightbsd.org/src/contrib/bzip2/decompress.c?r1=1.2&r2=1.3)