From: Jan Paul Tuecking <earl@ipfire.org>
Date: Mon, 26 Jul 2010 17:19:11 +0000 (+0200)
Subject: Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.9-beta1~87^2^2~3
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=09e756f8f2ec9485f7b87b87e8a00f44482f7854;hp=-c

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

09e756f8f2ec9485f7b87b87e8a00f44482f7854
diff --combined doc/packages-list.txt
index 62353d7f2f,cd0c850fa3..6515885294
--- a/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