JDK_1_5-Merge with HEAD: v_424
9 files changed