From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 14 Oct 2010 06:29:18 +0000 (+0200)
Subject: Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~60
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=a4aae93d9616aff917de21317a917246f9417b07

Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next

Conflicts:
	doc/packages-list.txt
---

a4aae93d9616aff917de21317a917246f9417b07
diff --cc doc/packages-list.txt
index dac3ba473d,7894e3d3c8..4d9d11e9b6
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -156,10 -149,9 +156,11 @@@
  * 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
@@@ -315,7 -299,7 +316,8 @@@
  * 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
@@@ -330,7 -314,7 +332,7 @@@
  * 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
@@@ -372,7 -355,7 +374,8 @@@
  * 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