BIND 10 master, updated. 4f85cc85d53701f871e047ce2146da33065ed757 Merge branch 'trac1567'

[BIND 10 source code commits]

The branch, master has been updated
       via  4f85cc85d53701f871e047ce2146da33065ed757 (commit)
       via  3617d5a8087d8489734f613fe4a85bc6fedd7a74 (commit)
      from  876da4518e24aac874604630104b2de86bcf309a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4f85cc85d53701f871e047ce2146da33065ed757
Merge: 876da4518e24aac874604630104b2de86bcf309a 3617d5a8087d8489734f613fe4a85bc6fedd7a74
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed Jan 18 09:18:15 2012 +0100

    Merge branch 'trac1567'

-----------------------------------------------------------------------

Summary of changes:
 src/lib/dhcp/iface_mgr_linux.cc |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dhcp/iface_mgr_linux.cc b/src/lib/dhcp/iface_mgr_linux.cc
index 657c943..8b19c27 100644
--- a/src/lib/dhcp/iface_mgr_linux.cc
+++ b/src/lib/dhcp/iface_mgr_linux.cc
@@ -21,7 +21,6 @@
 #include <exceptions/exceptions.h>
 
 #include <net/if.h>
-#include <linux/if_link.h>
 #include <linux/rtnetlink.h>
 
 using namespace std;