ICU-6646 Merge changes made for eclipse 3.5 release from maint-4-0

X-SVN-Rev: 25787
2 files changed