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

[Xavier Bachelot]

commit 3988602aa91cb3f7398d62d7fbb459154d921175
Merge: e6f21a4 c470cea
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Wed Sep 19 23:05:38 2012 +0200

    Merge branch 'master' into el5

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