[nagios-plugins/f13/master: 8/8] Merge branch 'master' into f13/master

[Peter Lemenkov]

commit 2029f8326fc4808daf307ed543f5491cfe162034
Merge: 9f41ab0 0ca327c
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Aug 18 23:55:20 2010 +0400

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

 .gitignore                                         |    1 +
 ...lugins-0001-Do-not-use-usr-local-for-perl.patch |    4 +-
 ...Remove-assignment-of-not-parsed-to-jitter.patch |    4 +-
 ...ific-fixes-for-searching-for-diff-and-tai.patch |    4 +-
 ...ific-patch-for-not-to-fixing-fully-qualif.patch |    4 +-
 nagios-plugins.spec                                |   22 +++++++++++++------
 sources                                            |    2 +-
 7 files changed, 25 insertions(+), 16 deletions(-)
---