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

diff --combined doc/packages-list.txt
index 392034a58c052e6cbb50b7a3a94b9055157e9973,d60335d0c4f931c2615ca4c3ad297432d25b571d..950c6c89f8a4edf7c6464d2d3f8cdd9d5ad7d428
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -67,7 -67,7 +67,7 @@@
  * collectd-4.5.1
  * coreutils-5.96
  * cpio-2.6
- * cpufrequtils-004
+ * cpufrequtils-005
  * cryptsetup-1.0.6
  * cups-1.3.9
  * curl-7.19.4
@@@ -210,6 -210,7 +210,7 @@@
  * nasm-0.98.39
  * ncftp-3.2.1-src
  * ncurses-5.5
+ * net-snmp-5.4.2.1
  * net-tools-1.60
  * netcat-0.7.1
  * netpbm-10.26.46
@@@ -225,8 -226,8 +226,8 @@@
  * openmailadmin-1.0.0
  * openssh-5.2p1
  * openssl-0.9.8k
- * openswan-2.6.20
- * openswan-2.6.20-kmod-VER
+ * openswan-2.6.21
+ * openswan-2.6.21-kmod-VER
  * openvpn-2.0.9
  * p7zip_4.65
  * pam_mysql-0.7RC1
@@@ -255,7 -256,7 +256,7 @@@
  * rssdler-0.4.0a
  * rsync-3.0.4
  * rtorrent-0.8.4
 -* samba-3.2.8
 +* samba-3.3.2
  * sane-1.0.19
  * screen-4.0.3
  * sdparm-1.01
@@@ -284,7 -285,7 +285,7 @@@
  * sysstat-6.0.2
  * sysvinit-2.86
  * taglib-1.5
- * tar-1.15.1
+ * tar-1.22
  * tcp_wrappers_7.6
  * tcpdump-3.8.3
  * tcptrack-1.3.0