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

[Peter Lemenkov]

commit 38d199491edb5989d340fa15b983643a5f0d3086
Merge: 04e4ea3 bb80ebd
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Sep 12 00:17:25 2010 +0400

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

 nrpe.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---