bda85c1 Merge branch 'master' into f13

Merged and Committed by xavierb 13 years ago
    Merge branch 'master' into f13
    
    Conflicts:
    	pnp4nagios.spec
    
        
file modified
+4 -1