svn cleanup
Merge branch 'rc1' of github.com:liuheng/byp into rc1