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

diff --combined config/rootfiles/core/32/filelists/files
index 3fff6939328c5136a91519b10c73c1f1c39f51d1,d0d2a7865ac7d17e328bc4129acf51d742622351..194c765e63cdda5ee815d431c604ad095280e214
--- 1/config/rootfiles/core/32/filelists/files
--- 2/config/rootfiles/core/32/filelists/files
+++ b/config/rootfiles/core/32/filelists/files
@@@ -1,11 -1,9 +1,12 @@@
  etc/system-release
  bin/probenic.sh
 +etc/rc.d/init.d/functions
 +etc/rc.d/init.d/checkfs
  etc/rc.d/init.d/networking/red
  opt/pakfire/lib/functions.pl
  srv/web/ipfire/cgi-bin/ids.cgi
 +srv/web/ipfire/cgi-bin/mac.cgi
  srv/web/ipfire/cgi-bin/pakfire.cgi
  var/ipfire/langs/de.pl
  var/ipfire/langs/en.pl
+ srv/web/ipfire/cgi-bin/index.cgi