JDK_1_5 - Merge with HEAD: v428a
26 files changed