Conflicts:
	dnscache.c
	query.c