testing..testing..
Merge branch 'librdkafka' of ssh://mtd-bro/home/kgrutzma/bro-grutz into librdkafka

Conflicts:
	src/logging/writers/Kafka.cc