Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit

Conflicts:
	config/etc/logrotate.conf

diff --cc config/rootfiles/common/armv5tel/initscripts
index c761e2667234bd209602194014a2cf5e13e670f4,980441599ec703d158feed8e74cbddf3b5c33077..e529e6644f92b9be10dc7d1a30b1304bbd6957bc
mode 100755,100644..100755
--- 1/config/rootfiles/common/armv5tel/initscripts
--- 2/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@@ -53,9 -52,9 +52,10 @@@ etc/rc.d/init.d/mISD
  #etc/rc.d/init.d/mldonkey
  etc/rc.d/init.d/modules
  #etc/rc.d/init.d/motion
 +#etc/rc.d/init.d/monit
  etc/rc.d/init.d/mountfs
  etc/rc.d/init.d/mountkernfs
+ etc/rc.d/init.d/mounttmpfs
  #etc/rc.d/init.d/mpd
  #etc/rc.d/init.d/mysql
  #etc/rc.d/init.d/netsnmpd

diff --cc config/rootfiles/common/i586/initscripts
index 525c55c455af95534d87963da0e307178cddcbe9,d0bc8c5c20dfc0dfe53ceaaec6ab33fc9da60ee6..58b67c88fb2e8d0ab91c67d42e9448c1d41d53ef
mode 100755,100644..100755
--- 1/config/rootfiles/common/i586/initscripts
--- 2/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts

diff --cc lfs/initscripts
index 4acf65e13eb965ae8673e0a40e72786a30d3a5c9,4894710ac371923dc6c0921723e69593fbb9f726..4894710ac371923dc6c0921723e69593fbb9f726
mode 100755,100644..100755
--- 1/lfs/initscripts
--- 2/lfs/initscripts
+++ b/lfs/initscripts

diff --cc make.sh
Simple merge