Merge branch 'ipset-5' of git://dev.medozas.de/ipset into ipset-5

diff --cc Makefile.am
Simple merge

diff --cc lib/Makefile.am
index 2d3df033492b3a92581dbb58c61744ba38497f62,79b81dbf5a5d53b30496eaf7fcb0790afca4761d..7913877de6003e9f3c6b11bc7ab7b3374bc019d1
--- 1/lib/Makefile.am
--- 2/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -6,10 -5,9 +5,11 @@@ AM_CFLAGS += ${libmnl_CFLAGS
  lib_LTLIBRARIES = libipset.la
  
  libipset_la_LDFLAGS = -version-info $(LIBVERSION)
+ libipset_la_LIBADD  = ${libmnl_LIBS}
  libipset_la_SOURCES = \
        data.c \
 +      icmp.c \
 +      icmpv6.c \
        mnl.c \
        parse.c \
        print.c \