Merging from trunk

svn path=/branches/release/libs/icl/; revision=84745