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

[Ján ONDREJ]

commit 0398f61687c7a8053bc420f7dad24202d0fd6455
Merge: 230ffa4 0c38a91
Author: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date:   Mon Nov 21 11:57:50 2011 +0100

    Merge branch 'master' into el6

 .gitignore      |    1 +
 pnp4nagios.spec |   65 ++++++++++++++++++++++++++++---------------------------
 sources         |    1 +
 3 files changed, 35 insertions(+), 32 deletions(-)
---