Merge r256769 by des from head:
  Last few remnants of BIND (hopefully...)

Approved by:	re (kib)
Merge r258122 from head:
  Emphasize that pf(4) in FreeBSD doesn't match pf(4) in
  OpenBSD 4.5, but is derived from it, and got some
  important local changes.

Approved by:	re (kib)
Merge r258128 from head:
  Fix a very bad typo from r248887.

Approved by:	re (kib)