Merge
[m6w6/libmemcached] / libtest / socket.hpp
2011-09-08  Brian AkerUpdate for OSX Lion build.