JDK_1_5 - Merge with HEAD: v440c
12 files changed