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