Conflicts:
	conf/libuniset2.spec
	conf/test.xml
	extensions/ModbusMaster/MBExchange.cc
	extensions/ModbusMaster/MBExchange.h
	extensions/UNetUDP/UNetExchange.cc
	extensions/UNetUDP/UNetReceiver.cc
	extensions/UNetUDP/UNetReceiver.h
	extensions/UNetUDP/UNetSender.h
	extensions/lib/MTR.cc
	src/Communications/Modbus/ModbusTCPMaster.cc