Conflicts:
	src/lib/log/README
	src/lib/log/logger_support.cc
	src/lib/log/messagedef.cc
	src/lib/log/messagedef.h
	src/lib/log/messagedef.mes
	src/lib/log/tests/logger_support_test.cc
	src/lib/log/tests/run_time_init_test.sh.in