[pnp4nagios/f13/master: 4/4] Merge branch 'master' into f13

[Xavier Bachelot]

commit bda85c1ee4192e039c1c7dacf8f287fdd53cb1a3
Merge: c59ba52 2123454
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Mon Sep 27 23:08:11 2010 +0200

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

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