Nothing terribly interesting here. R=mikesamuel, nigeltao, r CC=golang-dev https://golang.org/cl/5307044
