[gc]commit
Merge branch 'master' of github.umeng.com:zhangyan/sperm