[icinga-checkins] icinga.org: icinga-core/master: Merge branch 'master' into cmaser/fixes

[git at icinga.org]

Module: icinga-core
Branch: master
Commit: 838976de492b1fc00a5c1107622bc63ca9cf0201
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=838976de492b1fc00a5c1107622bc63ca9cf0201

Author: Christoph Maser <cmr at financial.com>
Date:   Fri Jul 30 22:45:05 2010 +0200

Merge branch 'master' into cmaser/fixes

Conflicts:
	cgi/cmd.c
	daemon-init.in
	sample-config/cgi.cfg.in

---