CVS Redux

OK, so I’ve given up on merging Classpath HEAD into my branch, or a release branch into my branch, because it just isn’t working. Instead, I’m going to continue with the branch I have, which I know runs well enough, and will just merge in Michael Barker’s scatter/gather NIO patch, since that’s the main thing that I need.

Sigh.