mergme

svn path=/sandbox-branches/straszheim/merge_me_into_trunk/libs/functional/function_traits.html; revision=53280