[nagios-plugins/el6/master: 2/2] Merge branch 'master' into el6/master

[Peter Lemenkov]

commit a958249a7e9ee0401ccffdd396901b23cc2d65db
Merge: f8540e9 3d8a254
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Oct 7 19:06:00 2010 +0400

    Merge branch 'master' into el6/master

 .gitignore                                         |    1 +
 ...lugins-0001-Do-not-use-usr-local-for-perl.patch |    8 +-
 ...Remove-assignment-of-not-parsed-to-jitter.patch |    6 +-
 ...ific-fixes-for-searching-for-diff-and-tai.patch |    6 +-
 ...ific-patch-for-not-to-fixing-fully-qualif.patch |    6 +-
 ...heck_linux_raid-with-on-linear-raid0-arra.patch |   53 +++++++++++++++
 ...ck_swap-from-returning-OK-if-no-swap-acti.patch |   50 ++++++++++++++
 nagios-plugins.spec                                |   71 +++++++++++--------
 8 files changed, 158 insertions(+), 43 deletions(-)
---