merge from freebsd without auto style correction.