Merge in trunk.
authorBrian Aker <brian@tangent.org>
Wed, 25 May 2011 01:03:51 +0000 (18:03 -0700)
committerBrian Aker <brian@tangent.org>
Wed, 25 May 2011 01:03:51 +0000 (18:03 -0700)
1  2 
libmemcached/hosts.cc

Simple merge