Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next

Conflicts:
	doc/packages-list.txt

diff --combined doc/packages-list.txt
index dac3ba473d1703a36b0d5cdd517e3ea7988286fe,7894e3d3c83df15a87de980727f1d8f89d4849e4..4d9d11e9b673bfee26554477db1658a4ad10f7a1
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -38,14 -38,12 +38,14 @@@
  * XML-Parser-2.34
  * alsa-lib-1.0.23
  * alsa-lib-1.0.23-kmod-2.6.32.24-ipfire
 +* alsa-lib-1.0.23-kmod-2.6.32.24-ipfire-pae
  * amavisd-new-2.5.2
  * apcupsd-3.14.4
  * applejuice-0.31
  * arping-2.05
  * as86-0.16.17
  * asterisk-1.4.28
 +* attr-2.4.43
  * autoconf-2.59
  * automake-1.9.6
  * backup-ipfire
@@@ -70,13 -68,11 +70,13 @@@
  * cmake-2.4.8
  * collectd-4.9.1
  * compat-wireless-2.6.35-1-kmod-2.6.32.24-ipfire
 +* compat-wireless-2.6.35-1-kmod-2.6.32.24-ipfire-pae
  * compat-wireless-2.6.35-1-kmod-2.6.32.24-ipfire-xen
  * coreutils-5.96
  * cpio-2.11
  * cpufrequtils-007
  * cryptodev-20091126-kmod-2.6.32.24-ipfire
 +* cryptodev-20091126-kmod-2.6.32.24-ipfire-pae
  * cryptodev-20091126-kmod-2.6.32.24-ipfire-xen
  * cups-1.4.4
  * curl-7.19.5
@@@ -84,7 -80,6 +84,7 @@@
  * cyrus-sasl-2.1.21
  * dahdi-2.2.1
  * dahdi-2.2.1-kmod-2.6.32.24-ipfire
 +* dahdi-2.2.1-kmod-2.6.32.24-ipfire-pae
  * dahdi-2.2.1-kmod-2.6.32.24-ipfire-xen
  * db-4.4.20
  * dbus-1.0.3
@@@ -96,10 -91,8 +96,10 @@@
  * dosfstools-3.0.9
  * dracut-006
  * e1000-8.0.19-kmod-2.6.32.24-ipfire
 +* e1000-8.0.19-kmod-2.6.32.24-ipfire-pae
  * e1000-8.0.19-kmod-2.6.32.24-ipfire-xen
  * e1000e-1.1.19-kmod-2.6.32.24-ipfire
 +* e1000e-1.1.19-kmod-2.6.32.24-ipfire-pae
  * e1000e-1.1.19-kmod-2.6.32.24-ipfire-xen
  * e2fsprogs-1.41.11
  * ebtables-v2.0.8-2
@@@ -118,7 -111,7 +118,7 @@@
  * fetchmail-6.3.16
  * ffmpeg-export-2008-04-13
  * file-4.17
 -* findutils-4.2.27
 +* findutils-4.4.2
  * flex-2.5.33
  * fontconfig-2.5.91
  * foomatic-3.0-20070813
@@@ -156,10 -149,9 +156,11 @@@
  * icegenerator-0.5.5-pre2
  * iftop-0.17
  * igb-2.3.4-kmod-2.6.32.24-ipfire
 +* igb-2.3.4-kmod-2.6.32.24-ipfire-pae
  * igb-2.3.4-kmod-2.6.32.24-ipfire-xen
  * igmpproxy-0.1
 +* imspector-0.9
+ * imspector-20101008
  * inetutils-1.4.2
  * ipaddr-1.2
  * iperf-2.0.4
@@@ -174,11 -166,9 +175,11 @@@
  * jpegsrc.v6b
  * kbd-1.12
  * kqemu-1.4.0pre1-kmod-2.6.32.24-ipfire
 +* kqemu-1.4.0pre1-kmod-2.6.32.24-ipfire-pae
  * kqemu-1.4.0pre1-kmod-2.6.32.24-ipfire-xen
  * kudzu-1.2.64
  * kvm-kmod-2.6.34.1-kmod-2.6.32.24-ipfire
 +* kvm-kmod-2.6.34.1-kmod-2.6.32.24-ipfire-pae
  * l7-protocols-2009-05-10
  * lame-3.97
  * lcd4linux-0.10.1-RC2
@@@ -186,7 -176,7 +187,7 @@@
  * less-394
  * libaal-1.0.5
  * libart_lgpl-2.3.17
 -* libcap-1.10
 +* libcap-2.19
  * libdvbpsi5-0.1.6
  * libevent-1.4.14b-stable
  * libid3tag-0.15.1b
@@@ -212,7 -202,6 +213,7 @@@
  * libxml2-2.6.26
  * libxslt-1.1.17
  * linux-2.6.32.24-ipfire
 +* linux-2.6.32.24-ipfire-pae
  * linux-2.6.32.24-ipfire-xen
  * linux-atm-2.4.1
  * linux-firmware-20100318
@@@ -225,11 -214,9 +226,11 @@@
  * lzo-2.02
  * m4-1.4.4
  * mISDN-20100525-kmod-2.6.32.24-ipfire
 +* mISDN-20100525-kmod-2.6.32.24-ipfire-pae
  * mISDN-20100525-kmod-2.6.32.24-ipfire-xen
  * mISDNuser-20100525
  * madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.24-ipfire
 +* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.24-ipfire-pae
  * madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.24-ipfire-xen
  * make-3.81
  * man-db-2.4.3
@@@ -300,13 -287,10 +301,13 @@@
  * qemu-0.11.1-kqemu
  * qemu-0.12.3
  * r8101-1.016.00-kmod-2.6.32.24-ipfire
 +* r8101-1.016.00-kmod-2.6.32.24-ipfire-pae
  * r8101-1.016.00-kmod-2.6.32.24-ipfire-xen
  * r8168-8.018.00-kmod-2.6.32.24-ipfire
 +* r8168-8.018.00-kmod-2.6.32.24-ipfire-pae
  * r8168-8.018.00-kmod-2.6.32.24-ipfire-xen
  * r8169-6.013.00-kmod-2.6.32.24-ipfire
 +* r8169-6.013.00-kmod-2.6.32.24-ipfire-pae
  * r8169-6.013.00-kmod-2.6.32.24-ipfire-xen
  * readline-5.1
  * reiser4progs-1.0.6
@@@ -315,7 -299,7 +316,8 @@@
  * rssdler-0.4.0a
  * rsync-3.0.7
  * rtorrent-0.8.6
 +* samba-3.5.5
+ * samba-3.5.6
  * sane-1.0.19
  * screen-4.0.3
  * sdparm-1.01
@@@ -330,7 -314,7 +332,7 @@@
  * spandsp-0.0.6pre12
  * splix-2.0.0-rc2
  * sqlite-3.6.10
--* squid-2.7.STABLE9
++* squid-3.1.8
  * squidGuard-1.4.1
  * squidclamav-5.4
  * sshfs-fuse-2.2
@@@ -363,7 -347,6 +365,7 @@@
  * usbutils-0.72
  * util-linux-2.12r
  * v4l-dvb-990bbeaeb761-kmod-2.6.32.24-ipfire
 +* v4l-dvb-990bbeaeb761-kmod-2.6.32.24-ipfire-pae
  * v4l-dvb-990bbeaeb761-kmod-2.6.32.24-ipfire-xen
  * vdr-1.6.0
  * vdradmin-am-3.6.7
@@@ -372,7 -355,7 +374,8 @@@
  * vlc-0.8.6i
  * vnstat-1.6
  * vnstati-beta3
 +* vsftpd-2.1.2
+ * vsftpd-2.2.2
  * w_scan-20080105
  * watchdog-5.9
  * wget-1.10.2