K 10
svn:author
V 3
imp
K 8
svn:date
V 27
2002-07-30T06:22:40.000000Z
K 7
svn:log
V 418
MFC: Merge most of this file from -current to here.  All those values
that are the same or have been added have been merged.  All the silly
white space differences were merged.  All the __P removals were
merged.

I didn't merge the changes to the ethernet media types because they
had been renumbered in -current and I didn't want to break binary
compatibility within -stable.

Added: IBSS and IBSSMASTER media types.

END