Merge branch 'master' of github.com:sebastien/libzmq

tests/Makefile.am

@@ -90,3 +90,4 @@ test_raw_sock_SOURCES = test_raw_sock.cpp
 
 #  Run the test cases
 TESTS = $(noinst_PROGRAMS)
+XFAIL_TESTS = test_linger

tests/test_linger.cpp

@@ -82,9 +82,6 @@ int main (void)
     //  poller_base.cpp:31.
     size_t size = 4000000;
     
-    //  TODO: Allow make check to pass, until this issue is resolved
-    size = 40000;
-    
     //  Start the sender thread and get message
     void *send_thread = zmq_threadstart (&sender, (void *) &size);
     zmq_msg_init (&msg);