JDK_1_5-Merge with HEAD: v_421a
19 files changed