Resolving merge conflicts from master branch

config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# OpenWrt version: Attitude Adjustment (r40431)
-# Fri Apr 18 12:30:00 2014
+# OpenWrt version: Attitude Adjustment (r41027)
+# Fri Jun 27 14:01:40 2014
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_TARGET_ppc40x is not set
@@ -588,8 +588,8 @@ CONFIG_TARGET_INIT_CMD="/sbin/init"
 CONFIG_TARGET_INIT_SUPPRESS_STDERR=y
 CONFIG_VERSIONOPT=y
 CONFIG_VERSION_DIST="Commotion Router"
-CONFIG_VERSION_NICK="Release 1.1rc1"
-CONFIG_VERSION_NUMBER="v1.1rc1"
+CONFIG_VERSION_NICK="Release 1.1"
+CONFIG_VERSION_NUMBER="v1.1"
 CONFIG_VERSION_REPO="http://downloads.commotionwireless.net/nightly/%S/packages"
 
 #
@@ -1471,89 +1471,6 @@ CONFIG_PACKAGE_odhcp6c=m
 # CONFIG_PACKAGE_tspc is not set
 # CONFIG_PACKAGE_tunslip6 is not set
 
-#
-# IPv6
-#
-
-#
-# Firewall
-#
-CONFIG_PACKAGE_ip6tables=y
-# CONFIG_PACKAGE_shorewall6-lite is not set
-
-#
-# IPv6 attack and analyzing toolset (thc-ipv6)
-#
-# CONFIG_PACKAGE_alive6 is not set
-# CONFIG_PACKAGE_detect-new-ip6 is not set
-# CONFIG_PACKAGE_dos-new-ip6 is not set
-# CONFIG_PACKAGE_fake_advertise6 is not set
-# CONFIG_PACKAGE_fake_mipv6 is not set
-# CONFIG_PACKAGE_fake_mld6 is not set
-# CONFIG_PACKAGE_fake_router6 is not set
-# CONFIG_PACKAGE_parasite6 is not set
-# CONFIG_PACKAGE_redir6 is not set
-# CONFIG_PACKAGE_rsmurf6 is not set
-# CONFIG_PACKAGE_smurf6 is not set
-# CONFIG_PACKAGE_toobig6 is not set
-
-#
-# IPv6 discovery tools
-#
-# CONFIG_PACKAGE_ndisc6 is not set
-# CONFIG_PACKAGE_rdisc6 is not set
-# CONFIG_PACKAGE_rdnssd is not set
-# CONFIG_PACKAGE_traceroute6 is not set
-
-#
-# miredo: Teredo (IPv6 tunneling over UDP through NAT)
-#
-# CONFIG_PACKAGE_miredo-client is not set
-# CONFIG_PACKAGE_miredo-common is not set
-# CONFIG_PACKAGE_miredo-server is not set
-
-#
-# wide-dhcpv6
-#
-# CONFIG_PACKAGE_wide-dhcpv6-client is not set
-# CONFIG_PACKAGE_wide-dhcpv6-control is not set
-# CONFIG_PACKAGE_wide-dhcpv6-relay is not set
-# CONFIG_PACKAGE_wide-dhcpv6-server is not set
-# CONFIG_PACKAGE_6in4 is not set
-# CONFIG_PACKAGE_6rd is not set
-# CONFIG_PACKAGE_6relayd is not set
-# CONFIG_PACKAGE_6scripts is not set
-# CONFIG_PACKAGE_6to4 is not set
-# CONFIG_PACKAGE_6tunnel is not set
-# CONFIG_PACKAGE_ahcpd is not set
-# CONFIG_PACKAGE_aiccu is not set
-# CONFIG_PACKAGE_bird6 is not set
-# CONFIG_PACKAGE_birdc6 is not set
-# CONFIG_PACKAGE_dhcp6-client is not set
-# CONFIG_PACKAGE_dhcp6-server is not set
-# CONFIG_PACKAGE_dibbler-client is not set
-# CONFIG_PACKAGE_dibbler-relay is not set
-# CONFIG_PACKAGE_dibbler-requestor is not set
-# CONFIG_PACKAGE_dibbler-server is not set
-# CONFIG_PACKAGE_ds-lite is not set
-# CONFIG_PACKAGE_gw6c is not set
-# CONFIG_PACKAGE_ipv6-support is not set
-# CONFIG_PACKAGE_ipv6calc is not set
-# CONFIG_PACKAGE_ipv6calc-mini is not set
-# CONFIG_PACKAGE_ipv6log is not set
-# CONFIG_PACKAGE_ipv6log-mini is not set
-# CONFIG_PACKAGE_mrd6 is not set
-# CONFIG_PACKAGE_ndppd is not set
-# CONFIG_PACKAGE_odhcp6c is not set
-# CONFIG_PACKAGE_ptrtd is not set
-# CONFIG_PACKAGE_radvd is not set
-# CONFIG_PACKAGE_radvdump is not set
-# CONFIG_PACKAGE_send is not set
-# CONFIG_PACKAGE_tayga is not set
-# CONFIG_PACKAGE_totd is not set
-# CONFIG_PACKAGE_tspc is not set
-# CONFIG_PACKAGE_tunslip6 is not set
-
 #
 # LuCI
 #
@@ -1598,7 +1515,7 @@ CONFIG_PACKAGE_luci-app-olsr-viz=y
 # CONFIG_PACKAGE_luci-app-p910nd is not set
 # CONFIG_PACKAGE_luci-app-pbx is not set
 # CONFIG_PACKAGE_luci-app-polipo is not set
-# CONFIG_PACKAGE_luci-app-qos is not set
+CONFIG_PACKAGE_luci-app-qos=y
 # CONFIG_PACKAGE_luci-app-radvd is not set
 # CONFIG_PACKAGE_luci-app-samba is not set
 # CONFIG_PACKAGE_luci-app-siitwizard is not set
@@ -1642,7 +1559,7 @@ CONFIG_PACKAGE_luci-i18n-english=y
 # CONFIG_PACKAGE_luci-i18n-portuguese-brazilian is not set
 # CONFIG_PACKAGE_luci-i18n-romanian is not set
 # CONFIG_PACKAGE_luci-i18n-russian is not set
-# CONFIG_PACKAGE_luci-i18n-spanish is not set
+CONFIG_PACKAGE_luci-i18n-spanish=m
 # CONFIG_PACKAGE_luci-i18n-ukrainian is not set
 # CONFIG_PACKAGE_luci-i18n-vietnamese is not set
 
@@ -1665,10 +1582,10 @@ CONFIG_PACKAGE_luci-sgi-cgi=y
 # 8. Libraries
 #
 CONFIG_PACKAGE_luci-lib-core=y
-# CONFIG_PACKAGE_luci-lib-core_compile is not set
+CONFIG_PACKAGE_luci-lib-core_compile=y
 # CONFIG_PACKAGE_luci-lib-core_stripped is not set
 # CONFIG_PACKAGE_luci-lib-core_srcdiet is not set
-CONFIG_PACKAGE_luci-lib-core_source=y
+# CONFIG_PACKAGE_luci-lib-core_source is not set
 # CONFIG_PACKAGE_luci-lib-fastindex is not set
 CONFIG_PACKAGE_luci-lib-httpclient=y
 CONFIG_PACKAGE_luci-lib-ipkg=y
@@ -1689,15 +1606,15 @@ CONFIG_PACKAGE_luci-lib-web=y
 # 9. Freifunk
 #
 # CONFIG_PACKAGE_freifunk-common is not set
-CONFIG_PACKAGE_freifunk-firewall=y
+# CONFIG_PACKAGE_freifunk-firewall is not set
 CONFIG_PACKAGE_freifunk-gwcheck=y
 # CONFIG_PACKAGE_freifunk-mapupdate is not set
 # CONFIG_PACKAGE_freifunk-p2pblock is not set
 # CONFIG_PACKAGE_freifunk-policyrouting is not set
 # CONFIG_PACKAGE_freifunk-watchdog is not set
 # CONFIG_PACKAGE_luci-mod-freifunk-community is not set
 # CONFIG_PACKAGE_meshwizard is not set
-CONFIG_PACKAGE_remote-update=y
+# CONFIG_PACKAGE_remote-update is not set
 
 #
 # Kernel modules
@@ -3373,7 +3290,7 @@ CONFIG_PACKAGE_lua-helpers-validate=y
 #
 # Translations
 #
-# CONFIG_PACKAGE_Commotion-Spanish is not set
+CONFIG_PACKAGE_Commotion-Spanish=m
 
 #
 # User Interface
@@ -3575,7 +3492,7 @@ CONFIG_PACKAGE_commotiond=y
 # CONFIG_PACKAGE_vim-full is not set
 # CONFIG_PACKAGE_vim-help is not set
 # CONFIG_PACKAGE_vim-runtime is not set
-# CONFIG_PACKAGE_zile is not set
+CONFIG_PACKAGE_zile=m
 
 #
 # Filesystem
@@ -3854,7 +3771,7 @@ CONFIG_PACKAGE_coreutils-sha1sum=y
 # CONFIG_PACKAGE_fxload is not set
 # CONFIG_PACKAGE_gawk is not set
 # CONFIG_PACKAGE_gdb is not set
-# CONFIG_PACKAGE_gdbserver is not set
+CONFIG_PACKAGE_gdbserver=m
 # CONFIG_PACKAGE_getopt is not set
 # CONFIG_PACKAGE_gnokii is not set
 # CONFIG_PACKAGE_gnupg is not set
@@ -3875,7 +3792,7 @@ CONFIG_PACKAGE_coreutils-sha1sum=y
 # CONFIG_PACKAGE_io is not set
 # CONFIG_PACKAGE_ipmitool is not set
 # CONFIG_PACKAGE_iwcap is not set
-# CONFIG_PACKAGE_iwinfo is not set
+CONFIG_PACKAGE_iwinfo=m
 # CONFIG_PACKAGE_jpeg-tools is not set
 CONFIG_PACKAGE_jshn=y
 # CONFIG_PACKAGE_kexec-tools is not set
@@ -4022,7 +3939,7 @@ CONFIG_PACKAGE_uboot-envtools=y
 #
 # CONFIG_PACKAGE_binutils is not set
 # CONFIG_PACKAGE_cppunit is not set
-# CONFIG_PACKAGE_diffutils is not set
+CONFIG_PACKAGE_diffutils=m
 # CONFIG_PACKAGE_make is not set
 # CONFIG_PACKAGE_objdump is not set
 CONFIG_PACKAGE_patch=y