[nrpe/f12/master: 3/3] Merge branch 'master' into f12/master

[Peter Lemenkov]

commit 981bd28400afbe17b4ec77f8cc3c31e86dc77347
Merge: 0bb846f daa26f1
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Mon Oct 25 15:44:59 2010 +0400

    Merge branch 'master' into f12/master

 nrpe.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --cc nrpe.spec
index aa25477,4be9fe5..1992e2b
--- a/nrpe.spec
+++ b/nrpe.spec
@@@ -130,8 -130,14 +130,14 @@@ f
  %doc Changelog LEGAL README
  
  %changelog
+ * Mon Oct 25 2010 Peter Lemenkov <lemenkov at gmail.com> - 2.12-16
+ - Issue with SELinux was resolved (see rhbz #565220#c25). 2nd try.
+ 
+ * Wed Sep 29 2010 jkeating - 2.12-15
+ - Rebuilt for gcc bug 634757
+ 
  * 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)