Merging from trunk

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