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

diff --combined doc/packages-list.txt
index 814ac33d8f4d67bbf146bd77956acf1004bdf81b,5de79e384eb7567a9396fc93b32e2e6257c27207..231d6f03d3b06c32339a012ba543826e3e33d3f4
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -60,7 -60,6 +60,7 @@@
  * clamav-0.93
  * cmake-2.4.8
  * collectd-4.3.0
 +* collectd-4.4.0
  * coreutils-5.96
  * cpio-2.6
  * cups-1.3.7
@@@ -185,6 -184,7 +185,7 @@@
  * mkinitcpio-0.5.9
  * mktemp-1.5
  * mldonkey-2.9.2
+ * mod_perl-2.0.4
  * module-init-tools-3.2.2
  * mpc-0.12.1
  * mpd-0.13.1
@@@ -242,7 -242,6 +243,7 @@@
  * rsync-2.6.9
  * rtorrent-0.7.9
  * samba-3.0.28a
 +* samba-3.0.29
  * sane-1.0.19
  * sane-1.0.19-kmod
  * screen-4.0.3