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

[Peter Lemenkov]

commit 3ffdd129440eb187267ee32c8e2b7869ac6f618e
Merge: e2538ee bd07c33
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Nov 3 18:08:16 2010 +0300

    Merge branch 'master' into f12/master

 nagios.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---