Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x

diff --combined doc/packages-list.txt
index 6515885294849ca3088a279ae1997c55fc62ac97,7cec76a713a765a5dbabe93461cedec11bf3ac94..f72d1f765b2da0c902f1ed921a39a4f10d0f5f34
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -30,7 -30,7 +30,7 @@@
  * Net-SSLeay-1.36
  * Net-Server-0.97
  * Pound-2.5
- * Python-2.4.3
+ * Python-2.7
  * SDL-1.2.11
  * Text-Tabs+Wrap-2005.0824
  * URI-1.35
@@@ -68,8 -68,8 +68,8 @@@
  * clamav-0.96.1
  * cmake-2.4.8
  * collectd-4.9.1
- * compat-wireless-2.6.34.1-kmod-2.6.32.15-ipfire
- * compat-wireless-2.6.34.1-kmod-2.6.32.15-ipfire-xen
+ * 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
  * coreutils-5.96
  * cpio-2.11
  * cpufrequtils-007
@@@ -304,7 -304,7 +304,7 @@@
  * sdparm-1.01
  * sed-4.1.5
  * setserial-2.17
- * setuptools-0.6c8
+ * setuptools-0.6c11
  * shadow-4.0.15
  * slang-1.4.9
  * smartmontools-5.39.1
@@@ -354,7 -354,7 +354,7 @@@
  * 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