Merge svn revision 1048 from Zebra cvs. Also add missing sokopt.h include
to ospf6_network.h.
6 files changed