K 10
svn:author
V 7
n_hibma
K 8
svn:date
V 27
2016-05-31T21:21:32.395557Z
K 7
svn:log
V 92
Fixup botched merge in rev. r300488.

This commit only updates mergeinfo, not sys/net/if.c.

END