JDK_1_5 - Merge with HEAD: v445
4 files changed