[nagios/f12/master: 13/13] Merge branch 'master' into f12/master

[Peter Lemenkov]

commit d97478a372851e7b192d2bc12962a47126f5d3b8
Merge: 906d9c6 5cea535
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat Sep 11 21:17:07 2010 +0400

    Merge branch 'master' into f12/master
    
    Conflicts:
    	.gitignore
    	nagios.spec
    	sources

 .gitignore  |    1 +
 nagios.spec |   92 ++++++++++++++++++++++++++++++++++------------------------
 sources     |    2 +-
 3 files changed, 56 insertions(+), 39 deletions(-)
---