update
Merge branch 'master' of github.com:wenfang/golang1.3-src
update