[nagios/el6: 4/4] Merge branch 'f17' into el6

[Jose Pedro Oliveira]

commit 7798dc9d381c842e8727e255e3125ad900ea7d7d
Merge: b42c380 e7addb0
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Sun Jan 13 14:59:39 2013 +0000

    Merge branch 'f17' into el6

 .gitignore                                         |    1 +
 ...-several-images-to-the-sample-config-revb.patch |   26 ++++++++++++++++++++
 nagios.spec                                        |   18 ++++++++++++-
 printer.png                                        |  Bin 0 -> 1649 bytes
 router.png                                         |  Bin 0 -> 2079 bytes
 sources                                            |    2 +-
 switch.png                                         |  Bin 0 -> 1181 bytes
 7 files changed, 44 insertions(+), 3 deletions(-)
---