Prepare for replication branch merge.

ext/extconf.rb

@@ -22,13 +22,13 @@ raise "shared library 'libmemcached' not found" unless
   find_library('memcached', 'memcached_server_add', *ENV['LD_LIBRARY_PATH'].to_s.split(":"))
 
 [ 
-  'libmemcached/memcached.h', 
+  'libmemcached/memcached.h',
   'libmemcached/memcached_constants.h', 
   'libmemcached/memcached_storage.h',
   'libmemcached/memcached_result.h',
   'libmemcached/memcached_server.h'
 ].each do |header|
-  raise "header file '#{include}' not  found" unless 
+  raise "header file '#{header}' not  found" unless 
     find_header(header, *ENV['INCLUDE_PATH'].to_s.split(":"))
 end
 

lib/memcached/memcached.rb

@@ -11,10 +11,12 @@ class Memcached
     :distribution => :consistent,
     :no_block => false,
     :buffer_requests => false,
+    :cache_lookups => true,
     :support_cas => false,
     :tcp_nodelay => false,
     :show_not_found_backtraces => false,
     :retry_timeout => 60,
+#    :poll_timeout => 5,
     :connect_timeout => 5,
     :namespace => nil,
     :sort_hosts => false

test/unit/memcached_test.rb

@@ -622,7 +622,6 @@ class MemcachedTest < Test::Unit::TestCase
       cache.get(key)
     end    
 
-    return
     # XXX Waiting on failover support in Libmemcached    
     assert_nothing_raised do
       cache.set(key, @value)