Merge branch 'ff/dns'

Conflicts:

	configure.in
	contrib/collection.cgi

diff --cc configure.in
index 1cbdc72557ec85b4c63345b78bbaecb88593f9b4,d2aff865315a46c3fe0457382dee4f9b4fcd28a2..cfce38055418b1735d7bc6dd782f4ef584d6869d
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -272,9 -272,9 +272,12 @@@ AC_CHECK_HEADERS(kvm.h
  # For debugging interface (variable number of arguments)
  AC_CHECK_HEADERS(stdarg.h)
  
 +# Regular expressions for the ignorelist.
 +AC_CHECK_HEADERS(regex.h)
 +
+ # For the dns plugin
+ AC_CHECK_HEADERS(arpa/nameser.h)
+ 
  dnl Checking for libraries
  AC_CHECK_LIB(m, ext)
  

diff --cc contrib/collection.cgi
index a7f63fd4e66c2becef7c8129502d7702fbba7dd3,2c769419d56da28f18f399dbd16b3214d952fa35..ddf4465312efd377617887b9912e62e84b36710d
--- 1/contrib/collection.cgi
--- 2/contrib/collection.cgi
+++ b/contrib/collection.cgi
@@@ -1058,7 -1117,8 +1117,8 @@@ our $GraphArgs 
        delay => ['-t', 'NTPd peer delay ({inst})', '-v', 'Seconds'],
        df => ['-t', '{host}:{inst} usage', '-v', 'Percent', '-l', '0'],
        disk => ['-t', '{host} disk {inst} usage', '-v', 'Byte/s'],
 -      fanspeed => ['-t', '{host} fanspeed {inst}', '-v', 'rpm'],
+       dns_traffic => ['-t', '{host} DNS traffic', '-v', 'Bit/s'],
 +      fanspeed => ['-t', '{host} fanspeed {inst}', '-v', 'RPM'],
        frequency_offset => ['-t', 'NTPd frequency offset ({inst})', '-v', 'Parts per million'],
        hddtemp => ['-t', '{host} hdd temperature {inst}', '-v', '°Celsius'],
        if_errors => ['-t', '{host} {inst} errors', '-v', 'Errors/s'],

diff --cc src/Makefile.am
Simple merge