Merging in jdk6 changes in preparation of 0.7.1 release