Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

Conflicts:
	config/rootfiles/core/35/filelists/files

diff --cc config/rootfiles/core/35/filelists/files
index 761f4f56105d89882ec44fb8dcbfd6b11ea35bac,0e5c74eaf817aea2a1968a5c17056e3ccb8efb2d..15fca784311ea4f3e2f5aa030d6e52b31e574d01
--- 1/config/rootfiles/core/35/filelists/files
--- 2/config/rootfiles/core/35/filelists/files
+++ b/config/rootfiles/core/35/filelists/files
@@@ -1,13 -1,4 +1,15 @@@
  etc/system-release
  srv/web/ipfire/cgi-bin/country.cgi
 -var/ipfire/outgoing/bin/outgoingfw.pl
 +etc/modprobe.d/hostap
 +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211.off
 +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt.off
 +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt_ccmp.off
 +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt_tkip.off
 +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt_wep.off
 +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211.off
 +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt.off
 +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_ccmp.off
 +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_tkip.off
 +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_wep.off
+ srv/web/ipfire/cgi-bin/outgoingfw.cgi
++var/ipfire/outgoing/bin/outgoingfw.pl