This is in prepartion for fixing issue 6320. R=golang-dev, dave CC=golang-dev https://golang.org/cl/13611043
Attach a file by drag & drop or click to upload
