also clarified the function description comment a bit further.

also making most of helper methods private, and reordered them a bit.

It has nicer interface and should be slightly less peculiar.

We don't need that intermediate variable

resolving conflicts in:
	src/lib/dns/master_loader.cc

The $INCLUDE can contain a name meaning origin. We don't handle origin
yet, that's #2427, but we at least mark the place where it should be
linked.

This change is to satisfy Solaris which issues warning about some struct
members being uninitialized and causing build to fail.

Added * (it's a backwards-incompatible change)

okayed on jabber

This reverts commit 3f9c7bb8.