mergme

svn path=/sandbox-branches/straszheim/merge_me_into_trunk/libs/functional/sublibs; revision=53280