Makes all tests pass. R=rsc CC=golang-dev https://golang.org/cl/5320041
Attach a file by drag & drop or click to upload
