restart of branch, this is to include changes from trunk

svn path=/sandbox-branches/birbacher/fix_iostreams/google_logo_40wht.png; revision=40545