Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/filelists/files
	config/rootfiles/core/40/update.sh

diff --cc doc/packages-list.txt
index e281e507889d8564f6ae8cb423f75765022f1c5e,ef64f054305c6207a3cc9f8970cc750f2db16495..e1ed31025cdfeef2442a7568ee407c56672aa7e5
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -64,11 -65,11 +64,11 @@@
  * 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.15-ipfire
 -* compat-wireless-2.6.35-1-kmod-2.6.32.15-ipfire-xen
 +* compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire
 +* compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire-xen
  * coreutils-5.96
  * cpio-2.11
  * cpufrequtils-007