Merging from trunk

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