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

[Peter Lemenkov]

commit db43712e44e1785da9e01fabd24832f599480c14
Merge: c1affc9 daa26f1
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Mon Oct 25 15:43:12 2010 +0400

    Merge branch 'master' into f14/master
    
    Conflicts:
    	nrpe.spec

 nrpe.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---