Merge svn revision 1048 from Zebra cvs. Also add missing sokopt.h include
to ospf6_network.h.
diff --git a/ospf6d/ospf6_network.c b/ospf6d/ospf6_network.c
index d5bfdd5..de0c3f3 100644
--- a/ospf6d/ospf6_network.c
+++ b/ospf6d/ospf6_network.c
@@ -24,6 +24,7 @@
 #include "log.h"
 #include "memory.h"
 #include "sockunion.h"
+#include "sockopt.h"
 #include "privs.h"
 
 #include "ospf6_proto.h"