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

[Peter Lemenkov]

commit 20408eac07c7c5ad74c995d07be6abfc8dbfc86c
Merge: 0b9e82f 035d618
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Jan 25 15:43:49 2011 +0300

    Merge branch 'master' into el6/master

 nagios-0001-from-rpm.patch                         |    4 +-
 nagios-0002-SELinux-relabeling.patch               |    4 +-
 nagios-0003-Fix-etc-init.d-nagios-status.patch     |    4 +-
 ...-installation-of-httpd-conf.d-config-file.patch |    4 +-
 nagios-0005-Install-config-files-too.patch         |    4 +-
 nagios-0006-Do-not-start-service-by-default.patch  |    4 +-
 ...ript-should-return-2-in-case-of-unknown-c.patch |    4 +-
 nagios-0008-Fix-path-to-CGI-executables.patch      |    4 +-
 ...th-to-passwd-file-in-Apache-s-config-file.patch |    4 +-
 ...Added-several-images-to-the-sample-config.patch |    4 +-
 nagios-0011-Fixed-strange-permissions.patch        |   35 ++++++++++++++++++++
 nagios.spec                                        |   16 ++++++---
 12 files changed, 66 insertions(+), 25 deletions(-)
---