Merge form http://jpcsp.googlecode.com/svn/trunk/.
Merge branch 'master' of https://github.com/shenweip/Jpcsp