Merge from http://jpcsp.googlecode.com/svn/trunk/.