Conflicts:
	Utilities/MBTester/mbrtuslave.cc
	Utilities/MBTester/mbtcpserver.cc
	conf/libuniset2.spec
	extensions/IOControl/IOControl.cc
	extensions/ModbusMaster/MBExchange.cc
	extensions/ModbusSlave/MBSlave.cc
	extensions/include/IOBase.h
	extensions/lib/IOBase.cc