Merging trunk@925447. git-svn-id: https://svn.apache.org/repos/asf/harmony/enhanced/jdktools/branches/java6@925454 13f79535-47bb-0310-9956-ffa450edef68