JDK_1_5 - Merge with HEAD: v448
16 files changed