[nrpe/el4/master: 21/21] Merge branch 'master' into el4/master

[Peter Lemenkov]

commit 24527ab33419eb85ccdc543e771f7749617ff0a9
Merge: d59e30f bb80ebd
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Sep 12 00:19:19 2010 +0400

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

 .gitignore |    4 ++++
 nrpe.spec  |    7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 2b3e90a,a522c48..289088c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,5 @@@
  nrpe-2.12.tar.gz
++<<<<<<< HEAD
++=======
+ /nrpe-2.12.tar.gz
++>>>>>>> master