Merge branch 'master' of ssh://git.ipfire.org/pub/git/network

Conflicts:
	Makefile

diff --cc Makefile
index 63d65c953ad9e33c96f5487c08ccc6971a9176e7,c6c83bf719a8a0fabdb53683f89bb029f123d445..8ca81f313edef5b4b6fed9cc8b3862f5757a3950
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -11,10 -11,9 +11,9 @@@ all
        @echo "Nothing to do here."
  
  install:
 -      -mkdir -pv $(DESTDIR)/etc/{network,ppp}
 +      -mkdir -pv $(DESTDIR)/etc/{network/{ports,zones},ppp}
-       -mkdir -pv $(DESTDIR)/lib/{network,udev}
+       -mkdir -pv $(DESTDIR)/lib/{network,sysctl.d,udev}
        -mkdir -pv $(DESTDIR)/sbin
-       -mkdir -pv $(DESTDIR)/usr/lib/sysctl.d
        -mkdir -pv $(DESTDIR)/var/log/network
  
        install -m 755 -v network $(DESTDIR)/sbin