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

[git at icinga.org]

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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Jan  5 17:45:01 2011 +0100

Merge branch 'cmaser/fixes'

---