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

[Peter Lemenkov]

commit 3e8e86c8c84c77071fb01d67fa19716d3e082bda
Merge: 1f3a02b bb80ebd
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Sep 12 00:18:26 2010 +0400

    Merge branch 'master' into el5/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