[pypy-hg-py] update
[pypy-py] update
Merge branch 'master' of git://github.com/archlinuxcn/repo