Merge branch 'master' into bmx6_testing

Conflicts:
	bmx6/Makefile
	olsrd/Makefile

diff --combined bmx6/Makefile
index 87e573af80ea63db860ae53521f90a8c72b54356,f0fe9fc9f59316b4dad0c9c982202ae69958f418..f560c47f9c182ed497e06d5250b8aebf471405eb
--- 1/bmx6/Makefile
--- 2/bmx6/Makefile
+++ b/bmx6/Makefile
@@@ -31,8 -31,8 +31,8 @@@ PKG_SOURCE_PROTO:=gi
  PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
  #PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
  
 -PKG_REV:=6c57a8062f737ae3d3a761b2f557142e1c969ccf
 -PKG_VERSION:=r2013060802
 +PKG_REV:=0a761a621b203af6c9edcd94872f91c1c60fa383
 +PKG_VERSION:=r2013051001
  PKG_RELEASE:=4
  
  PKG_SOURCE_VERSION:=$(PKG_REV)
@@@ -94,7 -94,7 +94,7 @@@ ende
  
  define Package/bmx6-quagga
    $(call Package/bmx6/Default)
-   DEPENDS:=bmx6 +qmp-quagga 
+   DEPENDS:=bmx6 +qmp-quagga @BROKEN
    TITLE:=bmx6 quagga plugin to redistribute/export routes (needs manet/bmx6 patched quagga 0.99.21)
  endef