Merge remote-tracking branch 'bpf/master'

Conflicts:
	Makefile.in

diff --combined Makefile.in
index 2b5f8ad6ecc6b796ec3e7942c56bb249f352774c,a54e71c035161dabaf89d6d92b41c7e0f180c98c..3fb1da8d74bddda3e79f796a7ed03f04368856f8
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -87,8 -87,8 +87,8 @@@ CSRC =        addrtoname.c af.c checksum.c cpa
        print-l2tp.c print-lane.c print-ldp.c print-lldp.c print-llc.c \
          print-lmp.c print-lspping.c print-lwapp.c \
        print-lwres.c print-mobile.c print-mpcp.c print-mpls.c print-mptcp.c print-msdp.c \
-       print-msnlb.c print-nfs.c print-ntp.c print-null.c print-olsr.c \
-       print-openflow.c print-openflow-1.0.c print-ospf.c \
+       print-msnlb.c print-nfs.c print-ntp.c print-null.c print-nflog.c \
 -      print-olsr.c print-ospf.c \
++      print-olsr.c print-openflow.c print-openflow-1.0.c print-ospf.c \
        print-pgm.c print-pim.c \
        print-ppi.c print-ppp.c print-pppoe.c print-pptp.c \
        print-radius.c print-raw.c print-rip.c print-rpki-rtr.c print-rrcp.c print-rsvp.c \
@@@ -167,7 -167,6 +167,7 @@@ HDR = 
        nlpid.h \
        ntp.h \
        oakley.h \
 +      openflow-1.0.h \
        ospf.h \
        ospf6.h \
        oui.h \