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

* commit '7adb2828f48e57c620f232c64d7c012774fa80a3':
  Fun with buffer overrruns.