Merge commit 'bff9ce5130d16af2fd802d42bdb2bff00980c9ae' into integrated

Conflicts:

	tools/Makefile.in

diff --cc filter/filter.c
Simple merge

diff --cc tools/Makefile.in
index 668bc1b16607066e687a368b5b1f8e3ad28e131a,062ba916170d073a6aad1d0ecdedeefd7892b4b1..bc84c543eb72d25c1e895cbe5f1167c3c0f0bc82
--- 1/tools/Makefile.in
--- 2/tools/Makefile.in
+++ b/tools/Makefile.in
@@@ -69,10 -69,10 +69,10 @@@ tags
  
  install: all
        $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@
-       $(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird
-       $(INSTALL_PROGRAM) -s $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl
 -      $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@
 -      $(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl@SUFFIX@
++      $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird
++      $(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl
        if test -n "@CLIENT@" ; then                                                            \
-               $(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ;             \
 -              $(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX@ ;        \
++              $(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ;                \
        fi
        if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then                                            \
                $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ;      \