restart of branch, this is to include changes from trunk

svn path=/sandbox-branches/birbacher/fix_iostreams/more/; revision=40545