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

[Peter Lemenkov]

commit b2bce930cb32a7856cb16dffa5bad0ba4a382374
Merge: d97478a 909da5a
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Oct 26 15:39:25 2010 +0400

    Merge branch 'master' into f12/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(-)
---