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

diff --combined doc/packages-list.txt
index 4a2aab0d2e774183ad7a59a6b665a33de9d94b4c,83d3d02cd2d61ec8a069054186ff7fac3fe620d4..f2c6bc5d387f1b0314051889cecb0cd416e89e9b
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -188,7 -188,7 +188,7 @@@
  * libshout-2.2.2
  * libsigc++-2.0.17
  * libtool-1.5.22
 -* libtorrent-0.12.4
 +* libtorrent-0.12.6
  * libupnp-1.6.6
  * libusb-0.1.12
  * libvorbis-1.2.3
@@@ -293,7 -293,7 +293,7 @@@
  * rrdtool-1.2.15
  * rssdler-0.4.0a
  * rsync-3.0.6
 -* rtorrent-0.8.4
 +* rtorrent-0.8.6
  * samba-3.3.9
  * sane-1.0.19
  * screen-4.0.3
@@@ -312,7 -312,7 +312,7 @@@
  * squashfs3.4
  * squid-2.7.STABLE7
  * squidGuard-1.4
 -* squidclamav-4.0
 +* squidclamav-4.1
  * sshfs-fuse-2.2
  * sslh-1.6i
  * streamripper-1.63.5
@@@ -338,6 -338,7 +338,7 @@@
  * udev-096-klibc
  * unzip552
  * urlgrabber-3.1.0
+ * usb_modeswitch-1.0.5
  * usbutils-0.72
  * util-linux-2.12r
  * v4l-dvb-aba823ecaea6-kmod-2.6.27.41-ipfire