resolved after merge

diff --cc unittest/test_simpleio_basics.cpp
index ed840fb,6e1b077..119bac3
--- 1/unittest/test_simpleio_basics.cpp
--- 2/unittest/test_simpleio_basics.cpp
+++ b/unittest/test_simpleio_basics.cpp
@@@ -945,16 -945,16 +945,16 @@@ class TestSimpleioBasics : public TestF
              UnixIOSocketPtr server;
              TestUnixIOSocket client0;
              TestUnixIOSocket client1;
 -            
 +
              bool res1 = server_port.open(path, 0600);
              CPPUNIT_ASSERT_EQUAL( true, res1 );
 -            
 +
              {
-                 Utils::FileStat stat(path,false);
+                 AsyncIo::Utils::FileStat stat(path,false);
                  CPPUNIT_ASSERT( stat.is_socket() );
 -                //FIXME: CPPUNIT_ASSERT_EQUAL( 0600u, (stat.mode() & 0777));
 +                CPPUNIT_ASSERT_EQUAL( 0600u, (stat.mode() & 0777));
              }
 -            
 +
              server_port.setNewConnectionCallback(
                  boost::bind( &UnixIOSocketHolder::store, &server_holder, _1)
              );