Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/filelists/files
	config/rootfiles/core/40/update.sh
This commit is contained in:
Arne Fitzenreiter
2010-08-18 21:54:42 +02:00
4 changed files with 9 additions and 9 deletions

View File

@@ -64,7 +64,7 @@
* ccache-3.0pre0
* cdrtools-2.01.01
* centerim-4.22.1
* clamav-0.96.1
* clamav-0.96.2
* cmake-2.4.8
* collectd-4.9.1
* compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire