Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/exclude
	config/rootfiles/core/40/filelists/files
	config/rootfiles/core/40/update.sh
	make.sh
This commit is contained in:
Arne Fitzenreiter
2010-09-05 14:32:42 +02:00
18 changed files with 411 additions and 102 deletions

View File

@@ -148,6 +148,8 @@
* icecream-0.9.4.8
* icegenerator-0.5.5-pre2
* iftop-0.17
* igb-2.3.4-kmod-2.6.32.15-ipfire
* igb-2.3.4-kmod-2.6.32.15-ipfire-xen
* igmpproxy-0.1
* imspector-0.9
* inetutils-1.4.2
@@ -306,7 +308,7 @@
* shadow-4.0.15
* slang-1.4.9
* smartmontools-5.39.1
* snort-2.8.6
* snort-2.8.6.1
* sox-12.18.1
* spandsp-0.0.6pre12
* splix-2.0.0-rc2
@@ -318,7 +320,7 @@
* sshfs-fuse-2.2
* sslh-1.7a
* streamripper-1.63.5
* strongswan-4.4.0
* strongswan-4.4.1
* sudo-1.6.8p12
* sysfsutils-1.3.0
* sysklogd-1.5