FIX: Improved handling of error messages in bulk inventory
FIX: diskstat: fix local variable ios_per_sec
FIX: flexible notification valuespec is now localizable
Merge branch 'master' of mathias-kettner.de:check_mk
FIX: winperf_processor - fixed wrong calculations of usage
Livestatus: fixed code indentation
Merge branch 'master' of ssh://mathias-kettner.de/check_mk
FIX: WATO configuration of filesystem trends: it's hours, not days

Conflicts:
	ChangeLog