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

[Peter Lemenkov]

commit fa9f1a9dab421bda3f75771c038477286de9de8e
Merge: bc074ca 909da5a
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Oct 26 15:40:07 2010 +0400

    Merge branch 'master' into el6/master

 .gitignore                                         |    1 +
 nagios-0001-from-rpm.patch                         |    6 +-
 nagios-0002-SELinux-relabeling.patch               |    9 +--
 nagios-0003-Fix-etc-init.d-nagios-status.patch     |    9 +--
 ...-installation-of-httpd-conf.d-config-file.patch |   25 +++++++
 nagios-0005-Install-config-files-too.patch         |   26 +++++++
 nagios.spec                                        |   76 ++++++++++----------
 sources                                            |    2 +-
 8 files changed, 103 insertions(+), 51 deletions(-)
---