olsrd: Merge branch 'olsrd_6and4' by Alessio Caiazza.

diff --combined olsrd/Makefile
index df8d068121f454a87a77697199cbb7277dce5cf3,5004b5f976ab9cb831107327d9ecac5379d3f291..d1516744e6d65f3d7855242d466267789f4dd021
--- 1/olsrd/Makefile
--- 2/olsrd/Makefile
+++ b/olsrd/Makefile
@@@ -8,13 -8,13 +8,13 @@@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=olsrd
 -PKG_VERSION:=0.6.6.1
 -PKG_RELEASE:=4
 +PKG_VERSION:=0.6.6.2
- PKG_RELEASE:=1
++PKG_RELEASE:=2
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6
  
 -PKG_MD5SUM:=ef480495f307232f1df931ae5df18bf9
 +PKG_MD5SUM:=e4e04bb033cffd99b3be397fa9063a54
  PKG_BUILD_PARALLEL:=1
  
  include $(INCLUDE_DIR)/package.mk
@@@ -37,7 -37,8 +37,8 @@@ define Package/olsr
  endef
  
  define Package/olsrd/conffiles
- /etc/config/olsrd
+ /etc/config/olsrd4
+ /etc/config/olsrd6
  endef
  
  define Package/olsrd-mod-arprefresh
@@@ -169,12 -170,16 +170,16 @@@ define Build/Compil
  endef
  
  define Package/olsrd/install
+       $(INSTALL_DIR) $(1)/lib/functions
+       $(INSTALL_DATA) ./files/olsrd.init $(1)/lib/functions/olsrd.sh
        $(INSTALL_DIR) $(1)/etc/config
-       $(INSTALL_DATA) ./files/olsrd.config $(1)/etc/config/olsrd
+       $(INSTALL_DATA) ./files/olsrd4.config $(1)/etc/config/olsrd4
+       $(INSTALL_DATA) ./files/olsrd6.config $(1)/etc/config/olsrd6
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/olsrd $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_BIN) ./files/olsrd.init $(1)/etc/init.d/olsrd
+       $(INSTALL_BIN) ./files/olsrd4.init $(1)/etc/init.d/olsrd4
+       $(INSTALL_BIN) ./files/olsrd6.init $(1)/etc/init.d/olsrd6
        $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
        $(INSTALL_BIN) ./files/olsrd.hotplug.sh $(1)/etc/hotplug.d/iface/50-olsrd
  endef