579ee5e Merge branch 'master' into f12

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