olsrd: Merge branch 'olsrd_6and4' by Alessio Caiazza.

diff --cc olsrd/Makefile
index df8d068121f454a87a77697199cbb7277dce5cf3,5004b5f976ab9cb831107327d9ecac5379d3f291..d1516744e6d65f3d7855242d466267789f4dd021
--- 1/olsrd/Makefile
--- 2/olsrd/Makefile
+++ b/olsrd/Makefile
@@@ -8,8 -8,8 +8,8 @@@
  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