Make deletes get along with new preserve option a little nicer.
Bring if_media support from -current across to 2.2..  It's dormant unless
used.  I've had reports that it works under 2.2 with the new if_de.c, but
I've only tested it with a hacked if_ed.c.
YAMFC: update to -current ifconfig for ifmedia support and 'ifconfig -l',
as well as various cleanups.
MFC: Remove lines inside #ifdef 0/#endif.
MFC: Use EX_USAGE in usage().
YAMFC (finish avoiding use of gdb's stale readline info).
sysconfig -> rc.conf
YAMFC.  The previous MFC was incomplete (it didn't merge the cosmetic
SRCDIR simplification) and broken (it went back to using the nonexistent
gnu/lib/libreadline/doc).  Try merging everything this time (SRCDIR
simplification, fix one stale path and remove the other).
Allow distSetByName() to process all the relevant entries.
Submitted by: msmith
Bring in 3.0 changes (dual booting et al).
Unfortunately, with the addition of the kernel config file, the boot blocks
are FULL again.  Time to do more bit buming.
YAMFC
MFC: Add -s flag in usage string.
MFC: Use err(3). Add DIAG... section in man page.
MFC: Use err(3). Remove whoami variable. Mdoc'ify man page.
Nm does not need any parameter, unless the first time.
MFC: Add usage(). Typo in man page.
MFC: Use err(3) instead of local redefinition. Change argument name so that
man page and usage string are in sync.
MFC: document the -k flag.
MFC: Add usage().
Merge 1.261.