[nagios/f12/master: 2/2] Merge branch 'master' into f12/master

[Peter Lemenkov]

commit e2538ee6b6a0f36fd2d3213b2915c5b4171fc580
Merge: b2bce93 a51ad6b
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Oct 27 13:18:05 2010 +0400

    Merge branch 'master' into f12/master

 nagios-0001-from-rpm.patch                         |    6 ++--
 nagios-0002-SELinux-relabeling.patch               |    6 ++--
 nagios-0003-Fix-etc-init.d-nagios-status.patch     |    6 ++--
 ...-installation-of-httpd-conf.d-config-file.patch |    6 ++--
 nagios-0005-Install-config-files-too.patch         |    6 ++--
 nagios-0006-Do-not-start-service-by-default.patch  |   25 +++++++++++++++++++
 ...ript-should-return-2-in-case-of-unknown-c.patch |   26 ++++++++++++++++++++
 nagios.spec                                        |    9 ++++++-
 8 files changed, 74 insertions(+), 16 deletions(-)
---