Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --combined doc/packages-list.txt
index f6d478a1950c43868949af07dec3b9f3511fff25,8fb00ea252c05669a7471db2cdc9be8ab278fdb3..061af4173deaea3ed97352f69b496b96dbf6a9fb
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -102,7 -102,7 +102,7 @@@
  * foomatic-3.0-20070813
  * freefont-20060126
  * freetype-2.1.10
- * fuse-2.6.3
+ * fuse-2.7.4
  * fwhits
  * gawk-3.1.5
  * gcc-4.0.3
@@@ -123,7 -123,7 +123,7 @@@
  * gzip-1.3.5
  * hddtemp-0.3-beta14
  * hdparm-8.9
- * hostapd-0.5.10
+ * hostapd-0.5.11
  * hplip-2.7.10
  * htop-0.8.1
  * httpd-2.2.10
@@@ -185,7 -185,7 +185,7 @@@
  * lzo-2.02
  * m4-1.4.4
  * mISDNuser.git-8e7bf2f11cc108d4b52949c2a26e38df24821b01
- * madwifi-hal-2008-08-15-r3862-20080903-kmod-2.6.25.19
+ * madwifi-hal-0.10.5.6-r3879-20081204-kmod-2.6.25.19
  * make-3.81
  * man-db-2.4.3
  * man-pages-2.34
@@@ -217,7 -217,7 +217,7 @@@
  * nfs-utils-1.1.1
  * nmap-4.03
  * noip_updater_v1.6
- * ntfs-3g-1.5012
+ * ntfs-3g-1.5130
  * ntp-4.2.2
  * ocaml-3.09.2
  * oinkmaster-2.0
@@@ -251,9 -251,9 +251,9 @@@
  * rp-pppoe-3.8
  * rrdtool-1.2.15
  * rssdler-0.4.0a
 -* rsync-2.6.9
 +* rsync-3.0.4
  * rtorrent-0.7.9
- * samba-3.2.5
+ * samba-3.2.6
  * sane-1.0.19
  * screen-4.0.3
  * sdparm-1.01
@@@ -270,7 -270,8 +270,8 @@@
  * squashfs3.4
  * squid-2.7.STABLE5
  * squidGuard-1.3
- * squidclamav-3.7
+ * squidclamav-3.8
+ * sshfs-fuse-2.2
  * streamripper-1.63.5
  * sudo-1.6.8p12
  * sysfsutils-1.3.0
@@@ -308,7 -309,7 +309,7 @@@
  * whatmask-1.2
  * which-2.16
  * wireless_tools.30.pre6
- * wpa_supplicant-0.5.10
+ * wpa_supplicant-0.5.11
  * xfsprogs-2.9.4
  * xvidcore-1.1.0
  * zlib-1.2.3