Added manpage for esx_vsphere_hostsystem.mem_usage
Merge branch 'master' of ssh://mathias-kettner.de/check_mk
FIX: apache_status: use (also) apache_status.cfg instead of apache_status.conf

Conflicts:
	ChangeLog
Fix .f12 compile helper for mkeventd