Merge from 'iptables', 'apache', 'repo', 'rrdtool', 'nagios' and
'pnp4nagios' branch