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