[pnp4nagios/el6: 3/3] Merge branch 'master' into el6

[Ján ONDREJ]

commit 3c5d08f264f9195a7d0bb80a0db24d5299282b3f
Merge: 0398f61 cc05f15
Author: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date:   Mon Nov 21 19:09:02 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	pnp4nagios.spec

 pnp4nagios.spec |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 deletions(-)
---