Conflicts:
doc/packages-list.txt
* 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
* 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
* 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
* 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