R=bsiegert CC=golang-dev, remyoudompheng https://codereview.appspot.com/33650044
R=bsiegert, r CC=golang-dev https://codereview.appspot.com/14414044