Conflicts:
	conf/libuniset2.spec
	conf/test.xml
	extensions/UNetUDP/UNetExchange.cc
	extensions/UNetUDP/UNetExchange.h
	extensions/UNetUDP/UNetReceiver.cc
	extensions/UNetUDP/UNetReceiver.h
	extensions/UNetUDP/UNetSender.cc
	extensions/UNetUDP/UNetSender.h
	extensions/lib/IOBase.cc
	src/ObjectRepository/ObjectIndex_idXML.cc