merge from hg
Merge branch 'master' of https://github.com/zhoujd/zznix