upgpkg: pypy 2.3.1-4

Fix conflict on itself

git-svn-id: file:///srv/repos/svn-community/svn@115379 9fca08f4-af9d-4005-b8df-a31f2cc04f65
archrelease: copy trunk to community-i686, community-x86_64

git-svn-id: file:///srv/repos/svn-community/svn@115380 9fca08f4-af9d-4005-b8df-a31f2cc04f65