[nrpe/f13/master: 4/4] Merge branch 'master' into f13/master

[Peter Lemenkov]

commit 1392e7c9e28e352ffbdf7a11acdd5c24e9d4ebdc
Merge: 07e4900 bb80ebd
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Sep 12 00:13:09 2010 +0400

    Merge branch 'master' into f13/master
    
    Conflicts:
    	.gitignore
    	nrpe.spec

 nrpe.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc nrpe.spec
index 4642204,a404093..aa25477
--- a/nrpe.spec
+++ b/nrpe.spec
@@@ -130,6 -130,9 +130,9 @@@ f
  %doc Changelog LEGAL README
  
  %changelog
+ * Sat Sep 11 2010 Peter Lemenkov <lemenkov at gmail.com> - 2.12-14
 -- Issue with SELinux was resolved (see rhbz #565220).
++- Issue with SELinux resolved (see rhbz #565220).
+ 
  * Fri Jun 18 2010 Peter Lemenkov <lemenkov at gmail.com> - 2.12-13
  - Init-script enhancements (see rhbz #247001, #567141 and #575544)