Conflicts:
	ChangeLog
	config.h.in
	config/ltmain.sh
	configure
	configure.in
	src/cybergarage/net/cinterface_function.c
	src/cybergarage/net/csocket.c
	src/cybergarage/upnp/cupnp_function.c
	std/av/include/cybergarage/upnp/std/av/ccontent.h
	std/av/src/cybergarage/upnp/std/av/cresource.c