Update FJP from JSR166 CVS.