ICU-6798 merge r25633 into m4

X-SVN-Rev: 25634
6 files changed