Merge branch 'stable'

Resolve conflict with Nicolas' Dichtel update on utils/Makefile.am
for nfnl_osf.

diff --cc utils/Makefile.am
index bfafd1d0d0c5807c1386278a4369a25ba10b62fc,66f5c5c17f5fa8155e616f32244d1ddc1e3fa5f5..c26aa6405e0e35d760025d2220a4b172e2cf6475
--- 1/utils/Makefile.am
--- 2/utils/Makefile.am
+++ b/utils/Makefile.am
@@@ -4,17 -4,7 +4,17 @@@ AM_CFLAGS = ${regular_CFLAGS
  AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include \
                -I${top_srcdir}/include ${libnfnetlink_CFLAGS}
  
 -sbin_PROGRAMS = nfnl_osf
 -pkgdata_DATA = pf.os
 +sbin_PROGRAMS =
 +pkgdata_DATA =
 +
 +if HAVE_LIBNFNETLINK
 +sbin_PROGRAMS += nfnl_osf
 +pkgdata_DATA += pf.os
  
- nfnl_osf_LDADD = -lnfnetlink
+ nfnl_osf_LDADD = ${libnfnetlink_LIBS}
 +endif
 +
 +if ENABLE_BPFC
 +sbin_PROGRAMS += nfbpf_compile
 +nfbpf_compile_LDADD = -lpcap
 +endif