Update from JSR166 CVS.