Hello ken2 (cc: golang-dev@googlegroups.com), I'd like you to review this change.
*** Submitted as 8f3359471c71 *** gc: bug306 Fixes issue 1040. R=ken2 CC=golang-dev http://codereview.appspot.com/2132047
lgtm