update for go 1.2rc1
Merge pull request #252 from dlintw/patch-1

update for go 1.2rc1