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

[Peter Lemenkov]

commit ae9813ff484005aeadd0ac8a30a569e72adae9c5
Merge: a4db191 bd07c33
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Nov 3 18:09:49 2010 +0300

    Merge branch 'master' into el6/master

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