R=golang-dev, dave, jpsugar, agl CC=golang-dev https://golang.org/cl/14641044
R=agl, golang-dev, dave CC=golang-dev https://golang.org/cl/13176044