Merge branch 'autoconf' of github.com:rubenk/pdns into autoconf
Merge branch 'autoconf' of github.com:rubenk/pdns into autoconf