I've just done a merge of the classlib tr...@901560 to the java6 branch. There were quite a few conflicts this time around in particular with TreeMap, TreeSet, and Properties so if you committed changes to these classes since the last merge you might want to sanity check that I merged your changes correctly.
Regards, Mark.
