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

diff --combined doc/packages-list.txt
index 62353d7f2f418b91fbd7b79848cf31a781f3fcb4,cd0c850fa30250749cf7d8448fe723b8f7c75433..6515885294849ca3088a279ae1997c55fc62ac97
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -68,10 -68,10 +68,10 @@@
  * clamav-0.96.1
  * cmake-2.4.8
  * collectd-4.9.1
- * compat-wireless-2.6.34-kmod-2.6.32.15-ipfire
- * compat-wireless-2.6.34-kmod-2.6.32.15-ipfire-xen
+ * 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
  * coreutils-5.96
- * cpio-2.6
+ * cpio-2.11
  * cpufrequtils-007
  * cryptodev-20091126-kmod-2.6.32.15-ipfire
  * cryptodev-20091126-kmod-2.6.32.15-ipfire-xen
@@@ -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