Merge in additional changes so that we remove a usage of std::string in the
[awesomized/libmemcached] / libmemcached / options / server.h
2011-03-25  Brian AkerMerge in code changes for all of the new parser.
2011-03-18  Brian AkerMerge in all of the new parser work.