From: Christian Schmidt <christian.schmidt@ipfire.org>
Date: Fri, 23 Jul 2010 07:40:33 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.9-beta1~150
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=8e7778a8fca173fede71bde64c06eb48690d8a1f

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

8e7778a8fca173fede71bde64c06eb48690d8a1f
diff --cc doc/packages-list.txt
index 447ffcdc0a,70e3b96f00..b88f4e3fac
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -68,9 -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.11
  * cpio-2.6
  * cpufrequtils-007
  * cryptodev-20091126-kmod-2.6.32.15-ipfire