[pnp4nagios/f12/master: 5/5] Merge branch 'master' into f12

[Xavier Bachelot]

commit 579ee5e5d3c25fd9e3bced553ca3e2a27648b4b1
Merge: d569ec9 2123454
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Mon Sep 27 23:09:34 2010 +0200

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

 pnp4nagios.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---