Merge branch 'master' into next

Conflicts:
	doc/packages-list.txt

diff --combined doc/packages-list.txt
index b21bce4e68afb9e0f5190beb4ae7ddafbacc632a,fd04405fee9a0907cd66c530544c848c1fe76c29..ee2467a661e60ca899b2f48244b6bad73ef661e8
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -1,4 -1,4 +1,4 @@@
 -== List of softwares used to build IPFire Version: 2.7 ==
 +== List of softwares used to build IPFire Version: 2.8test ==
  * Archive-Tar-1.29
  * Archive-Zip-1.16
  * BerkeleyDB-0.27
@@@ -37,7 -37,7 +37,7 @@@
  * Unix-Syslog-0.100
  * XML-Parser-2.34
  * alsa-lib-1.0.23
 -* alsa-lib-1.0.23-kmod-2.6.32.15-ipfire
 +* alsa-lib-1.0.23-kmod-2.6.32.21-ipfire
  * amavisd-new-2.5.2
  * apcupsd-3.14.4
  * applejuice-0.31
@@@ -56,6 -56,7 +56,6 @@@
  * bluez-libs-3.36
  * br2684ctl
  * bridge-utils-1.1
 -* busybox-1.2.2
  * bwm-ng-0.6
  * bzip2-1.0.5
  * cacti-0.8.7e
@@@ -67,20 -68,20 +67,20 @@@
  * 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.21-ipfire
 +* compat-wireless-2.6.35-1-kmod-2.6.32.21-ipfire-xen
  * coreutils-5.96
  * cpio-2.11
  * cpufrequtils-007
 -* cryptodev-20091126-kmod-2.6.32.15-ipfire
 -* cryptodev-20091126-kmod-2.6.32.15-ipfire-xen
 +* cryptodev-20091126-kmod-2.6.32.21-ipfire
 +* cryptodev-20091126-kmod-2.6.32.21-ipfire-xen
- * cups-1.4.2
+ * cups-1.4.4
  * curl-7.19.5
  * cyrus-imapd-2.2.12
  * cyrus-sasl-2.1.21
  * dahdi-2.2.1
 -* dahdi-2.2.1-kmod-2.6.32.15-ipfire
 -* dahdi-2.2.1-kmod-2.6.32.15-ipfire-xen
 +* dahdi-2.2.1-kmod-2.6.32.21-ipfire
 +* dahdi-2.2.1-kmod-2.6.32.21-ipfire-xen
  * db-4.4.20
  * dbus-1.0.3
  * ddrescue-1.12
@@@ -89,11 -90,10 +89,11 @@@
  * diffutils-2.8.1
  * dnsmasq-2.45
  * dosfstools-3.0.9
 -* e1000-8.0.19-kmod-2.6.32.15-ipfire
 -* e1000-8.0.19-kmod-2.6.32.15-ipfire-xen
 -* e1000e-1.1.19-kmod-2.6.32.15-ipfire
 -* e1000e-1.1.19-kmod-2.6.32.15-ipfire-xen
 +* dracut-006
 +* e1000-8.0.19-kmod-2.6.32.21-ipfire
 +* e1000-8.0.19-kmod-2.6.32.21-ipfire-xen
 +* e1000e-1.1.19-kmod-2.6.32.21-ipfire
 +* e1000e-1.1.19-kmod-2.6.32.21-ipfire-xen
  * e2fsprogs-1.41.11
  * ebtables-v2.0.8-2
  * ed-0.2
@@@ -138,9 -138,9 +138,9 @@@
  * gzip-1.3.5
  * hddtemp-0.3-beta14
  * hdparm-8.9
 -* hostapd-0.7.2
 +* hostapd-0.7.3
  * hplip-2.7.10
- * htop-0.8.1
+ * htop-0.8.3
  * httpd-2.2.15
  * hwdata
  * iana-etc-2.10
@@@ -148,8 -148,8 +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
 +* igb-2.3.4-kmod-2.6.32.21-ipfire
 +* igb-2.3.4-kmod-2.6.32.21-ipfire-xen
  * igmpproxy-0.1
  * imspector-0.9
  * inetutils-1.4.2
@@@ -160,15 -160,16 +160,15 @@@
  * iptables-1.4.6
  * iptstate-2.1
  * iputils-ss020927
 -* iw-0.9.15
 +* iw-0.9.20
  * java-1.6.0_12-for-ipfire
  * joe-3.7
  * jpegsrc.v6b
  * kbd-1.12
 -* klibc-1.5.14
 -* kqemu-1.4.0pre1-kmod-2.6.32.15-ipfire
 -* kqemu-1.4.0pre1-kmod-2.6.32.15-ipfire-xen
 +* kqemu-1.4.0pre1-kmod-2.6.32.21-ipfire
 +* kqemu-1.4.0pre1-kmod-2.6.32.21-ipfire-xen
  * kudzu-1.2.64
 -* kvm-kmod-2.6.33.1-kmod-2.6.32.15-ipfire
 +* kvm-kmod-2.6.34.1-kmod-2.6.32.21-ipfire
  * l7-protocols-2009-05-10
  * lame-3.97
  * lcd4linux-0.10.1-RC2
@@@ -201,8 -202,8 +201,8 @@@
  * libwww-perl-5.803
  * libxml2-2.6.26
  * libxslt-1.1.17
 -* linux-2.6.32.15-ipfire
 -* linux-2.6.32.15-ipfire-xen
 +* linux-2.6.32.21-ipfire
 +* linux-2.6.32.21-ipfire-xen
  * linux-atm-2.4.1
  * linux-firmware-20100318
  * linux-libc-headers-2.6.12.0
@@@ -213,11 -214,11 +213,11 @@@
  * lynis-1.2.9
  * lzo-2.02
  * m4-1.4.4
 -* mISDN-20100525-kmod-2.6.32.15-ipfire
 -* mISDN-20100525-kmod-2.6.32.15-ipfire-xen
 +* mISDN-20100525-kmod-2.6.32.21-ipfire
 +* mISDN-20100525-kmod-2.6.32.21-ipfire-xen
  * mISDNuser-20100525
 -* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.15-ipfire
 -* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.15-ipfire-xen
 +* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.21-ipfire
 +* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.21-ipfire-xen
  * make-3.81
  * man-db-2.4.3
  * man-pages-2.34
@@@ -230,6 -231,7 +230,6 @@@
  * miau-0.6.5
  * minicom-2.4
  * misc-progs
 -* mkinitcpio-0.5.9
  * mktemp-1.5
  * mldonkey-3.0.0
  * module-init-tools-3.5
@@@ -286,12 -288,12 +286,12 @@@
  * psmisc-22.2
  * qemu-0.11.1-kqemu
  * qemu-0.12.3
 -* r8101-1.016.00-kmod-2.6.32.15-ipfire
 -* r8101-1.016.00-kmod-2.6.32.15-ipfire-xen
 -* r8168-8.018.00-kmod-2.6.32.15-ipfire
 -* r8168-8.018.00-kmod-2.6.32.15-ipfire-xen
 -* r8169-6.013.00-kmod-2.6.32.15-ipfire
 -* r8169-6.013.00-kmod-2.6.32.15-ipfire-xen
 +* r8101-1.016.00-kmod-2.6.32.21-ipfire
 +* r8101-1.016.00-kmod-2.6.32.21-ipfire-xen
 +* r8168-8.018.00-kmod-2.6.32.21-ipfire
 +* r8168-8.018.00-kmod-2.6.32.21-ipfire-xen
 +* r8169-6.013.00-kmod-2.6.32.21-ipfire
 +* r8169-6.013.00-kmod-2.6.32.21-ipfire-xen
  * readline-5.1
  * reiser4progs-1.0.6
  * reiserfsprogs-3.6.21
@@@ -299,7 -301,7 +299,7 @@@
  * rssdler-0.4.0a
  * rsync-3.0.7
  * rtorrent-0.8.6
- * samba-3.5.4
+ * samba-3.5.5
  * sane-1.0.19
  * screen-4.0.3
  * sdparm-1.01
@@@ -314,6 -316,7 +314,6 @@@
  * spandsp-0.0.6pre12
  * splix-2.0.0-rc2
  * sqlite-3.6.10
 -* squashfs-lzma-cvs20100214
  * squid-2.7.STABLE9
  * squidGuard-1.4.1
  * squidclamav-5.4
@@@ -324,12 -327,11 +324,12 @@@
  * sudo-1.6.8p12
  * sysfsutils-1.3.0
  * sysklogd-1.5
 -* syslinux-3.62
 +* syslinux-3.86
  * sysstat-6.0.2
  * sysvinit-2.86
  * taglib-1.5
  * tar-1.22
 +* tcl8.4.13
  * tcp_wrappers_7.6
  * tcpdump-4.0.0
  * teamspeak-2.0.24.1
@@@ -339,15 -341,15 +339,15 @@@
  * traceroute-2.0.12
  * tripwire-2.4.1.2
  * tunctl
 -* udev-096
 -* udev-096-klibc
 +* udev-125
  * unzip552
  * urlgrabber-3.1.0
 -* usb-modeswitch-1.1.2
 +* usb-modeswitch-1.1.3
 +* usb-modeswitch-data-20100707
  * usbutils-0.72
  * util-linux-2.12r
 -* v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire
 -* v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire-xen
 +* v4l-dvb-990bbeaeb761-kmod-2.6.32.21-ipfire
 +* v4l-dvb-990bbeaeb761-kmod-2.6.32.21-ipfire-xen
  * vdr-1.6.0
  * vdradmin-am-3.6.7
  * vim-7.0
@@@ -361,8 -363,8 +361,8 @@@
  * wget-1.10.2
  * whatmask-1.2
  * which-2.16
 -* wireless_tools.30.pre6
 -* wpa_supplicant-0.6.9
 +* wireless_tools.30.pre9
 +* wpa_supplicant-0.7.3
  * xfsprogs-2.9.4
  * xvidcore-1.2.1
  * xz-4.999.9beta