[nagios-plugins/el4/master: 50/50] Merge branch 'master' into el4/master

[Peter Lemenkov]

commit e872da848080686c84216b2c6f74b4996aa53536
Merge: 7b3c05a 0ca327c
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Aug 19 00:06:14 2010 +0400

    Merge branch 'master' into el4/master
    
    Conflicts:
    	.gitignore
    	nagios-plugins.spec
    	sources

 .gitignore                                         |    1 +
 ...-behaviour-in-case-of-self-signed-certifi.patch |   27 --------------------
 nagios-plugins.spec                                |   14 +++++-----
 sources                                            |    2 +-
 4 files changed, 9 insertions(+), 35 deletions(-)
---