[nsca/el6: 4/4] Merge branch 'master' into el6

[Xavier Bachelot]

commit bbfe0c045964ed1484b82493cb9c23c661e7c1f0
Merge: 50f3965 c470cea
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Wed Sep 19 23:05:03 2012 +0200

    Merge branch 'master' into el6

 nsca-initscript |   98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 nsca-sysconfig  |    7 ++++
 nsca.service    |   11 ++++++
 nsca.spec       |   58 ++++++++++++++++++++++++++++----
 4 files changed, 167 insertions(+), 7 deletions(-)
---