Merge branch 'master' of git://git.inai.de/iptables

Conflicts:
	extensions/GNUmakefile.in

Resolution: trivial, since this was a fuzz 3.

Reason: Line added from v1.4.15-16-g33710a5 was in vincinity of changes
from v1.4.15-22-g4496801.

diff --cc extensions/GNUmakefile.in
index 163903001f3892379c7f483c3374bb43e6d459ab,2e0921e4cdfee3ca2e7a0e6fa01bc40622ee130a..8b38df9152487c11efbe1951b4edaf1cd1237631
--- 1/extensions/GNUmakefile.in
--- 2/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@@ -77,10 -75,10 +75,10 @@@ install: ${targets_install
        if test -n "${targets_install}"; then install -pm0755 $^ "${DESTDIR}${xtlibdir}/"; fi;
  
  clean:
-       rm -f *.o *.oo *.so *.a {matches,targets}[46].man initext.c initext4.c initext6.c;
+       rm -f *.o *.oo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
 +      rm -f .*.d .*.dd;
  
  distclean: clean
 -      rm -f .*.d .*.dd;
  
  init%.o: init%.c
        ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=$*_init ${CFLAGS} -o $@ -c $<;