Merge branch 'master' of ssh://lu32joj@lxlogin1.lrz.de/home/hpc/pr28fa/lu32joj/dcdb.git

Conflicts:
	FileSpewer/FileSpewer.cpp

FileSpewer/FileSpewer.cpp

@@ -12,6 +12,7 @@
 
 #include <unistd.h>
 #include <sys/stat.h>
+#include <linux/limits.h>
 
 #include "Settings.h"
 #include "mosquitto.h"

FileSpewer/Makefile

@@ -2,7 +2,7 @@ CXXFLAGS =	-O2 -g -Wall -Werror -fmessage-length=0 -I../../mosquitto-1.1/lib/
 
 OBJS =		FileSpewer.o Settings.o
 
-LIBS =		-L../../mosquitto-1.1/lib/ -lmosquitto
+LIBS =		-L../../mosquitto-1.1/lib/ -lmosquitto -lssl -lcrypto -pthread
 
 TARGET =	FileSpewer