[nrpe/el6: 8/8] Merge branch 'master' into el6

[Peter Lemenkov]

commit e8d4162a6987beebcf8d7057e5108f6074964d46
Merge: 10d6057 0974316
Author: Fedora Build <lemenkov at gmail.com>
Date:   Mon Sep 17 14:59:37 2012 +0400

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore         |    2 +
 nrpe-tmpfiles.conf |    1 +
 nrpe.service       |   14 +++++++++
 nrpe.spec          |   83 +++++++++++++++++++++++++++++++++++++++++++++++----
 sources            |    2 +-
 5 files changed, 94 insertions(+), 8 deletions(-)
---