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

[Peter Lemenkov]

commit a340152accf8eebe70e7a2d33140553fa0ff5c41
Merge: 3e8e86c daa26f1
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Mon Oct 25 15:46:31 2010 +0400

    Merge branch 'master' into el5/master

 nrpe.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---