R=golang-dev, gri CC=golang-dev https://golang.org/cl/5376048
R=golang-dev, adg, peterGo CC=golang-dev https://golang.org/cl/4274072