am 2f3be368: Add the beginnings of logging infrastructure.

* commit '2f3be368e5ad911cc0b014421dd3682130260ffc':
  Add the beginnings of logging infrastructure.