Merge branch 'master' of github.com:openwrt-routing/packages

diff --combined bmx6/Makefile
index dea2c5d2a4b9a04d98808203af62d43b7485dc3a,8786a3f5d5a611870e5e3e5a9968fb93a53fa625..212c97156cbddb1f53385d386286743cc5ba39ae
--- 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:=c0076183ce28fe15285c8faa51920e74633776fe
- PKG_VERSION:=r2013041901
+ PKG_REV:=60adcbd4655ccf36a407bae58d66914e33f05a41
+ PKG_VERSION:=r2013060803
  PKG_RELEASE:=4
  
  PKG_SOURCE_VERSION:=$(PKG_REV)
@@@ -61,7 -61,7 +61,7 @@@ define Package/bmx6/Defaul
    TITLE:=BMX6 layer 3 routing daemon
    URL:=http://bmx6.net/
    MAINTAINER:=Axel Neumann <neumann@cgws.de>
-   DEPENDS:=+kmod-ip6-tunnel +kmod-iptunnel6
+   DEPENDS:=+kmod-ip6-tunnel +kmod-iptunnel6 +kmod-tun
  endef
  
  define Package/bmx6/description
@@@ -82,7 -82,7 +82,7 @@@ ende
  
  define Package/bmx6-json
    $(call Package/bmx6/Default)
 -  DEPENDS:=bmx6 +libjson
 +  DEPENDS:=bmx6 +libjson-c
    TITLE:=json plugin based on jsonc
  endef