Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/filelists/compat-wireless
	config/rootfiles/core/40/filelists/files
	doc/packages-list.txt

diff --cc config/kernel/kernel.config.i586-ipfire
Simple merge

diff --cc config/rootfiles/core/40/exclude
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/config/rootfiles/core/40/exclude
--- 2/config/rootfiles/core/40/exclude
+++ /dev/null

diff --cc config/rootfiles/core/40/filelists/files
index 34fb93159341063af4bbacbb19ed7eb9a1c2b690,79518f2dccf89f66811065a6c07fc8a01edb934d..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/config/rootfiles/core/40/filelists/files
--- 2/config/rootfiles/core/40/filelists/files
+++ /dev/null
@@@ -1,16 -1,20 +1,0 @@@
--etc/system-release
--var/ipfire/langs/en.pl
--var/ipfire/langs/de.pl
--var/ipfire/langs/es.pl
--var/ipfire/langs/fr.pl
--var/ipfire/dhcp/dhcpd.conf.local
--etc/rc.d/init.d/dnsmasq
--etc/rc.d/init.d/functions
--srv/web/ipfire/cgi-bin/dhcp.cgi
--srv/web/ipfire/cgi-bin/time.cgi
--usr/lib/python2.7/ipaddr.pyc
--usr/lib/python2.7/site-packages/drv_libxml2.py
--usr/lib/python2.7/site-packages/libxml2.py
--usr/lib/python2.7/site-packages/libxml2mod.so
--usr/lib/python2.7/site-packages/libxml2.pyc
--usr/lib/python2.7/site-packages/libxsltmod.so
 -lib/modules/2.6.32.15-ipfire/kernel/drivers/usb/serial/option.ko
 -lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/usb/serial/option.ko
 -lib/modules/2.6.32.15-ipfire/kernel/drivers/usb/serial/usbserial.ko
 -lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/usb/serial/usbserial.ko

diff --cc config/rootfiles/core/40/filelists/python
index ffe6e2c498bfc9fe8fc99cafc9e7c9e6d7d5c972,ffe6e2c498bfc9fe8fc99cafc9e7c9e6d7d5c972..0000000000000000000000000000000000000000
deleted file mode 120000,120000
--- 1/config/rootfiles/core/40/filelists/python
--- 2/config/rootfiles/core/40/filelists/python
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
--../../../common/python

diff --cc config/rootfiles/core/40/meta
index d547fa86fa8487654281f4d5309d6733f66a323c,d547fa86fa8487654281f4d5309d6733f66a323c..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/config/rootfiles/core/40/meta
--- 2/config/rootfiles/core/40/meta
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
--DEPS=""

diff --cc config/rootfiles/core/40/update.sh
index 11e039594e9f7e1ad70c9d9b779bfe4922118b58,11e039594e9f7e1ad70c9d9b779bfe4922118b58..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/config/rootfiles/core/40/update.sh
--- 2/config/rootfiles/core/40/update.sh
+++ /dev/null
@@@ -1,51 -1,51 +1,0 @@@
--#!/bin/bash
--############################################################################
--#                                                                          #
--# This file is part of the IPFire Firewall.                                #
--#                                                                          #
--# IPFire is free software; you can redistribute it and/or modify           #
--# it under the terms of the GNU General Public License as published by     #
--# the Free Software Foundation; either version 3 of the License, or        #
--# (at your option) any later version.                                      #
--#                                                                          #
--# IPFire is distributed in the hope that it will be useful,                #
--# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
--# GNU General Public License for more details.                             #
--#                                                                          #
--# You should have received a copy of the GNU General Public License        #
--# along with IPFire; if not, write to the Free Software                    #
--# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
--#                                                                          #
--# Copyright (C) 2010 IPFire-Team <info@ipfire.org>.                        #
--#                                                                          #
--############################################################################
--#
--. /opt/pakfire/lib/functions.sh
--/usr/local/bin/backupctrl exclude >/dev/null 2>&1
--
--#
--#Stop services
--
--#
--#Extract files
--extract_files
--#
--#Remove old python files...
--rm -rf /usr/lib/python2.4
--
--#
--#Start services
--
--#
--#Update Language cache
--perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
--
--#
--#Rebuild module dep's
--depmod 2.6.32.15-ipfire
--depmod 2.6.32.15-ipfire-xen
--#
--#Finish
--#Don't report the exitcode last command
--exit 0

diff --cc doc/packages-list.txt
index e4fca57161e5b2222b006b0703fbdb0c6a30ddfb,7cec76a713a765a5dbabe93461cedec11bf3ac94..d3f54fa545541e1fd75c839d3eb0fadfdaaa5b70
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -67,7 -68,8 +67,8 @@@
  * clamav-0.96.1
  * cmake-2.4.8
  * collectd-4.9.1
 -* compat-wireless-2.6.35-1-kmod-2.6.32.15-ipfire
 -* compat-wireless-2.6.35-1-kmod-2.6.32.15-ipfire-xen
 +* compat-wireless-2.6.34.1-kmod-2.6.32.17-ipfire
++* compat-wireless-2.6.35-1-kmod-2.6.32.17-ipfire
  * coreutils-5.96
  * cpio-2.11
  * cpufrequtils-007