am 45f6da64: (-s ours) Merge "Fun with buffer overrruns."

* commit '45f6da643b723e29aa94147adc2f143588e1d919':
  Fun with buffer overrruns.