[master] Merge branch 'trac1957'

Conflicts:
	src/lib/dhcp/iface_mgr.cc

diff --cc src/lib/dhcp/iface_mgr.cc
index 508413dfe87b2bd939f62680148eadc284b1464c,578cdb21c1f16ce73443797a66cb0189b7e9326c..ae975d0820aae98a429af51d7bb3f0bd9135dce5
--- 1/src/lib/dhcp/iface_mgr.cc
--- 2/src/lib/dhcp/iface_mgr.cc
+++ b/src/lib/dhcp/iface_mgr.cc
@@@ -18,7 -18,7 +18,8 @@@
  #include <string.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>
 +#include <sys/select.h>
+ #include <asio.hpp>
  
  #include <dhcp/dhcp4.h>
  #include <dhcp/dhcp6.h>
@@@ -228,11 -229,11 +231,11 @@@ bool IfaceMgr::openSockets4(const uint1
      int sock;
      int count = 0;
  
-     for (IfaceCollection::iterator iface=ifaces_.begin();
-          iface!=ifaces_.end();
+     for (IfaceCollection::iterator iface = ifaces_.begin();
+          iface != ifaces_.end();
           ++iface) {
  
 -        cout << "Trying interface " << iface->getFullName() << endl;
 +        cout << "Trying opening socket on interface " << iface->getFullName() << endl;
  
          if (iface->flag_loopback_ ||
              !iface->flag_up_ ||

diff --cc src/lib/dhcp/iface_mgr.h
Simple merge

diff --cc src/lib/dhcp/tests/iface_mgr_unittest.cc
index e7ccb680ba23f340467e0174418972a22f9d3797,9ea38bc264ab56d5ae72d2f9b40b3ebef4597b1c..df818d8cbe865cc3122c18eee766423b6b8b1151
--- 1/src/lib/dhcp/tests/iface_mgr_unittest.cc
--- 2/src/lib/dhcp/tests/iface_mgr_unittest.cc
+++ b/src/lib/dhcp/tests/iface_mgr_unittest.cc
@@@ -17,8 -17,8 +17,9 @@@
  #include <fstream>
  #include <sstream>
  
 +#include <unistd.h>
  #include <arpa/inet.h>
+ #include <boost/scoped_ptr.hpp>
  #include <gtest/gtest.h>
  
  #include <asiolink/io_address.h>