Merge commit '568d9c9faeab70951d8e9bfea521e1b38a9a3d1c' into integrated

Conflicts:

	tools/Makefile.in

diff --cc configure.in
Simple merge

diff --cc tools/Makefile.in
index 182e97c969d95b22f52e2ff8738884620ea4ac2f,adf35b64262a8cfd25fe45101d526062a076bf21..59e8aba6521a4d040435d2b695f07fa0c3e5cd8a
--- 1/tools/Makefile.in
--- 2/tools/Makefile.in
+++ b/tools/Makefile.in
@@@ -57,9 -67,10 +67,10 @@@ tags
  
  install: all
        $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@
 -      $(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@
 -      $(INSTALL_PROGRAM) -s $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl@SUFFIX@
 +      $(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird
++      $(INSTALL_PROGRAM) -s $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl
        if test -n "@CLIENT@" ; then                                                            \
 -              $(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX@ ;     \
 +              $(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ;             \
        fi
        if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then                                            \
                $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ;      \