[nagios/el6/master: 3/3] Merge branch 'master' into el6/master

[Peter Lemenkov]

commit 14c87010490a7abe678bc044bedf66652670c541
Merge: be6e604 55afcf7
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Nov 18 22:20:13 2010 +0300

    Merge branch 'master' into el6/master

 nagios-0001-from-rpm.patch                         |    2 +-
 nagios-0002-SELinux-relabeling.patch               |    2 +-
 nagios-0003-Fix-etc-init.d-nagios-status.patch     |    2 +-
 ...-installation-of-httpd-conf.d-config-file.patch |    2 +-
 nagios-0005-Install-config-files-too.patch         |    2 +-
 nagios-0006-Do-not-start-service-by-default.patch  |    2 +-
 ...ript-should-return-2-in-case-of-unknown-c.patch |    2 +-
 nagios-0008-Fix-path-to-CGI-executables.patch      |    2 +-
 ...th-to-passwd-file-in-Apache-s-config-file.patch |   34 ++++++++++++++++++++
 nagios.spec                                        |   12 ++++++-
 10 files changed, 53 insertions(+), 9 deletions(-)
---