Update from JSR166 CVS.
Merge branch 'jsr166'