Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/filelists/files
	make.sh
This commit is contained in:
Arne Fitzenreiter
2010-08-29 12:59:53 +02:00
28 changed files with 853 additions and 18 deletions

View File

@@ -34,6 +34,7 @@ etc/rc.d/init.d/functions
etc/rc.d/init.d/halt
#etc/rc.d/init.d/hostapd
#etc/rc.d/init.d/icecream
#etc/rc.d/init.d/imspector
#etc/rc.d/init.d/ipfireseeder
etc/rc.d/init.d/ipsec
#etc/rc.d/init.d/lcd4linux