Merge pull request #1 from netty/master

merge netty to me