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

diff --combined doc/packages-list.txt
index f72d1f765b2da0c902f1ed921a39a4f10d0f5f34,1f60b70b62d9bde0a4c2ff9cdeb8075dc4453e68..b6f9f881da78fb78ff52d49c3e624041243865f0
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -65,7 -65,7 +65,7 @@@
  * ccache-3.0pre0
  * cdrtools-2.01.01
  * centerim-4.22.1
- * clamav-0.96.1
+ * clamav-0.96.2
  * cmake-2.4.8
  * collectd-4.9.1
  * compat-wireless-2.6.35-1-kmod-2.6.32.15-ipfire
@@@ -264,7 -264,7 +264,7 @@@
  * openmailadmin-1.0.0
  * openssh-5.4p1
  * openssl-0.9.8o
- * openvpn-2.1.1
+ * openvpn-2.1.2
  * p7zip_4.65
  * pam_mysql-0.7RC1
  * patch-2.5.4
@@@ -316,7 -316,7 +316,7 @@@
  * squashfs-lzma-cvs20100214
  * squid-2.7.STABLE9
  * squidGuard-1.4.1
- * squidclamav-5.3
+ * squidclamav-5.4
  * sshfs-fuse-2.2
  * sslh-1.7a
  * streamripper-1.63.5
@@@ -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