Conflicts:
	connman/include/technology.h
	connman/plugins/ofono.c
	connman/src/agent-connman.c
	connman/src/agent.c
	connman/src/dnsproxy.c
	connman/src/ipconfig.c
	connman/src/main.c
	connman/src/manager.c
	connman/src/nfacct.c
	connman/src/service.c
	connman/src/shared/nfacct.c
	connman/src/shared/nfacct.h
	connman/src/shared/nfnetlink_acct_copy.h
	connman/src/technology.c
	connman/tools/netlink-test.c