Merge from trunk.
[m6w6/libmemcached] / libmemcached / options /
2011-03-18  Brian AkerMerge in all of the new parser work.