[trac900] Merge branch 'master' into trac900
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
src/lib/log/log_formatter.cc
0 → 100644
src/lib/log/log_formatter.h
0 → 100644