Merge pull request #3187 from cmouse/illumos-fixes

author bert hubert <bert.hubert@netherlabs.nl>

Fri, 8 Jan 2016 19:53:23 +0000 (20:53 +0100)

committer bert hubert <bert.hubert@netherlabs.nl>

Fri, 8 Jan 2016 19:53:23 +0000 (20:53 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Fri, 8 Jan 2016 19:53:23 +0000 (20:53 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Fri, 8 Jan 2016 19:53:23 +0000 (20:53 +0100)
diff --cc configure.ac
Simple merge
diff --cc pdns/iputils.hh
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Fri, 8 Jan 2016 19:53:23 +0000 (20:53 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Fri, 8 Jan 2016 19:53:23 +0000 (20:53 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/iputils.hh	patch \|	diff1 \|	diff2 \|	blob \| history