Merging from trunk

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