[nagios/el4/master: 53/53] Merge branch 'el5/master' into el4/master

[Peter Lemenkov]

commit 6c676bde2da882326203d05178bf5e47055482dc
Merge: 0fece61 d5b78f3
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat Sep 11 22:37:31 2010 +0400

    Merge branch 'el5/master' into el4/master
    
    Conflicts:
    	.gitignore
    	nagios-0001-Fix-init-script.patch
    	nagios-0002-Increased-plugin-output-buffer.patch
    	nagios-0003-Fix-for-CVE-2009-2288.patch
    	nagios.spec

 .gitignore                                         |    1 +
 nagios-0001-Fix-init-script.patch                  |    6 +-
 nagios-0002-Increased-plugin-output-buffer.patch   |    6 +-
 nagios-0003-Fix-for-CVE-2009-2288.patch            |    6 +-
 ...Backported-fix-for-segfault-in-status.cgi.patch |   26 +++++++++++
 nagios.spec                                        |   48 +++++++++++---------
 6 files changed, 63 insertions(+), 30 deletions(-)
---