Also fix a shadowed error variable bug. R=golang-dev, rsc CC=golang-dev https://golang.org/cl/5573072
Attach a file by drag & drop or click to upload
