Fixes a bug reported on golang-nuts. R=rsc, adg CC=golang-dev https://golang.org/cl/3641042
Attach a file by drag & drop or click to upload
