restart of branch, this is to include changes from trunk

svn path=/sandbox-branches/birbacher/fix_iostreams/libs/functional/function_traits.html; revision=40545