Update for Go 1.1
Merge branch 'master' of git://github.com/davecheney/golang-crosscompile